Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use the fully qualified portal url when copying apps #129

Merged
merged 1 commit into from
Apr 15, 2016
Merged

use the fully qualified portal url when copying apps #129

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions src/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,13 @@ require([
var template = jquery("#sessionTemplate").html();
var html = mustache.to_html(template, data);
app.portals.sourcePortal.username = data.user.username;
app.portals.sourcePortal.portalUrl = "https://" + data.portalHostname + "/";
if (data.isPortal === true) {
app.portals.sourcePortal.portalUrl = "https://" + data.portalHostname + "/";
} else {
// Set it to the org's custom URL instead of www.arcgis.com.
app.portals.sourcePortal.portalUrl = "https://" + data.urlKey + "." + data.customBaseUrl + "/";
}

jquery(".nav.navbar-nav").after(html);
jquery("#logout").show();
jquery("#actionDropdown").css({
Expand Down Expand Up @@ -186,8 +192,13 @@ require([
app.portals.destinationPortal.token = response.token;
app.portals.destinationPortal.self().done(function(data) {
app.portals.destinationPortal.username = data.user.username;
app.portals.destinationPortal.portalUrl = "https://" +
data.portalHostname + "/";
if (data.isPortal === true) {
app.portals.destinationPortal.portalUrl = "https://" + data.portalHostname + "/";
} else {
// Set it to the org's custom URL instead of www.arcgis.com.
app.portals.destinationPortal.portalUrl = "https://" + data.urlKey + "." + data.customBaseUrl + "/";
}

jquery("#copyModal").modal("hide");
highlightCopyableContent();
NProgress.start();
Expand Down Expand Up @@ -964,9 +975,9 @@ require([
.done(function(response) {
var html;
if (response.success === true) {
// Update the id parameter to reflect the new item's id.
// Swizzle the portal url and id parameter to reflect the url of new item.
if (description.url.indexOf("id=") > -1) {
var newUrl = description.url.substring(description.url.indexOf("/apps/"));
var newUrl = destinationPortal.portalUrl + description.url.substring(description.url.indexOf("apps/"));
newUrl = newUrl.replace("id=" + description.id, "id=" + response.id);
var folder = response.folder || "";
destinationPortal.updateUrl(destinationPortal.username, folder, response.id, newUrl)
Expand Down