summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2012-09-14 21:33:06 +0000
committerOlivier Lamy <olamy@apache.org>2012-09-14 21:33:06 +0000
commit619541066a4e3b7068e5cd5fcba85e2bfb92bda4 (patch)
tree20afe115b305d00fcf5299f9573e89cd148c004d
parent4da10176c82df84402f2a1f2d266596db299c559 (diff)
downloadarchiva-619541066a4e3b7068e5cd5fcba85e2bfb92bda4.tar.gz
archiva-619541066a4e3b7068e5cd5fcba85e2bfb92bda4.zip
cleanup main content when 403 error
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1384929 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js1
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js9
2 files changed, 6 insertions, 4 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
index 3d0fa332b..f338dca45 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
@@ -41,6 +41,7 @@ function() {
removeMediumSpinnerImg("#main-content");
clearUserMessages();
displayRestError($.parseJSON(data.responseText));
+ $("#main-content" ).html("");
//displayErrorMessage($.i18n.prop('error.500'));
}
}
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
index 77a76ba97..886711189 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
@@ -151,14 +151,15 @@ require(["jquery","jquery.tmpl","i18n"], function(jquery,jqueryTmpl,i18n) {
/**
* open a confirm dialog based on bootstrap modal
* @param okFn callback function to call on ok confirm
- * @param okMessage
- * @param cancelMessage
- * @param title
+ * @param okMessage message in the ok button
+ * @param cancelMessage message in the cancel button
+ * @param title title of the modal box
+ * @param bodyText html content of the modal box
*/
openDialogConfirm=function(okFn, okMessage, cancelMessage, title,bodyText){
var dialogCancel=$("#dialog-confirm-modal-cancel");
if (window.modalConfirmDialog==null) {
- window.modalConfirmDialog = $("#dialog-confirm-modal").modal();//{backdrop:'static',show:false}
+ window.modalConfirmDialog = $("#dialog-confirm-modal").modal();
window.modalConfirmDialog.bind('hidden', function () {
$("#dialog-confirm-modal-header-title").html("");
$("#dialog-confirm-modal-body-text").html("");