Commit a9672da0 by kevalbhatt Committed by nixonrodrigues

ATLAS-3513 : Classic UI: Sidebar not rendered on refresh if url has…

ATLAS-3513 : Classic UI: Sidebar not rendered on refresh if url has 'from=classification' queryParam Signed-off-by: 's avatarnixonrodrigues <nixon@apache.org>
parent 72243644
...@@ -295,8 +295,9 @@ define([ ...@@ -295,8 +295,9 @@ define([
}, that.preFetchedCollectionLists, that.sharedObj) }, that.preFetchedCollectionLists, that.sharedObj)
)); ));
} else { } else {
App.rNContent.$el.html(""); if (App.rNContent.currentView) {
App.rNContent.destroy(); App.rNContent.currentView.destroy();
}
} }
}); });
}, },
......
...@@ -37,7 +37,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum ...@@ -37,7 +37,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
skipDefaultError: true, skipDefaultError: true,
success: function(data) { success: function(data) {
Utils.notifySuccess({ Utils.notifySuccess({
content: "Classification " + options.tagName + Messages.getAbbreviationMsg(abbrev, 'removeSuccessMessage') content: "Classification " + options.tagName + Messages.getAbbreviationMsg(false, 'removeSuccessMessage')
}); });
if (options.callback) { if (options.callback) {
options.callback(); options.callback();
......
...@@ -35,9 +35,7 @@ define(['require'], function(require) { ...@@ -35,9 +35,7 @@ define(['require'], function(require) {
ENTITY_IMPORT_UPDATE: "Entity Updated by import", ENTITY_IMPORT_UPDATE: "Entity Updated by import",
ENTITY_IMPORT_DELETE: "Entity Deleted by import", ENTITY_IMPORT_DELETE: "Entity Deleted by import",
TERM_ADD: "Term Added", TERM_ADD: "Term Added",
TERM_DELETE: "Term Deleted", TERM_DELETE: "Term Deleted"
LABEL_ADD: "Label Added",
LABEL_DELETE: "Label Deleted"
} }
Enums.entityStateReadOnly = { Enums.entityStateReadOnly = {
......
...@@ -127,7 +127,7 @@ define(['require', ...@@ -127,7 +127,7 @@ define(['require',
view = "search"; view = "search";
if (queryParams && queryParams.from) { if (queryParams && queryParams.from) {
if (queryParams.from == "classification") { if (queryParams.from == "classification") {
view = "tag"; view = "classification";
} else if (queryParams.from == "glossary") { } else if (queryParams.from == "glossary") {
view = "glossary"; view = "glossary";
} }
......
...@@ -268,7 +268,7 @@ define([ ...@@ -268,7 +268,7 @@ define([
var that = this; var that = this;
require(["views/site/Header", "views/search/SearchDefaultLayoutView", "views/site/SideNavLayoutView"], function(Header, SearchDefaultLayoutView, SideNavLayoutView) { require(["views/site/Header", "views/search/SearchDefaultLayoutView", "views/site/SideNavLayoutView"], function(Header, SearchDefaultLayoutView, SideNavLayoutView) {
var paramObj = Utils.getUrlState.getQueryParams(); var paramObj = Utils.getUrlState.getQueryParams();
if (paramObj && (paramObj.type || paramObj.tag || paramObj.term || paramObj.query) === undefined) { if (paramObj && (paramObj.type || paramObj.tag || paramObj.term || paramObj.query || paramObj.udKeys || paramObj.udLabels) === undefined) {
Utils.setUrl({ Utils.setUrl({
url: "#!/search", url: "#!/search",
mergeBrowserUrl: false, mergeBrowserUrl: false,
...@@ -581,8 +581,9 @@ define([ ...@@ -581,8 +581,9 @@ define([
) )
); );
} else { } else {
App.rContent.$el.html(""); if (App.rNContent.currentView) {
App.rContent.destroy(); App.rNContent.currentView.destroy();
}
} }
}); });
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment