From 619541066a4e3b7068e5cd5fcba85e2bfb92bda4 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 14 Sep 2012 21:33:06 +0000 Subject: [PATCH] cleanup main content when 403 error git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1384929 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/webapp/js/archiva/startup.js | 1 + .../src/main/webapp/js/archiva/utils.js | 9 +++++---- 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(""); -- 2.39.5