Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6D1EF200CB2 for ; Sat, 10 Jun 2017 13:25:49 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6C012160BFD; Sat, 10 Jun 2017 11:25:49 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 680DD160BEF for ; Sat, 10 Jun 2017 13:25:48 +0200 (CEST) Received: (qmail 56068 invoked by uid 500); 10 Jun 2017 11:25:47 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 56054 invoked by uid 99); 10 Jun 2017 11:25:47 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Jun 2017 11:25:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 690E9E9671; Sat, 10 Jun 2017 11:25:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: martin_s@apache.org To: commits@archiva.apache.org Date: Sat, 10 Jun 2017 11:25:55 -0000 Message-Id: <80dfeec84c7d408d8e510f9b8973812d@git.apache.org> In-Reply-To: <7c7ac97616fa4e44a1807292602f2609@git.apache.org> References: <7c7ac97616fa4e44a1807292602f2609@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/50] archiva git commit: Add admin user check after system configuration change archived-at: Sat, 10 Jun 2017 11:25:49 -0000 Add admin user check after system configuration change Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/f327eb9b Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/f327eb9b Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/f327eb9b Branch: refs/heads/citest Commit: f327eb9b2493e8250e87847d0b167827bcad16df Parents: 6dcd84d Author: Martin Stockhammer Authored: Wed Oct 26 23:29:11 2016 +0200 Committer: Martin Stockhammer Committed: Wed Oct 26 23:29:11 2016 +0200 ---------------------------------------------------------------------- .../js/archiva/admin/features/generaladmin/main.js | 12 ++++++++++-- .../archiva-webapp/src/main/webapp/js/archiva/main.js | 5 +++-- 2 files changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/f327eb9b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js index 8d3269e..95ed9f3 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js @@ -1358,7 +1358,15 @@ define("archiva/admin/features/generaladmin/main",["jquery","jquery.ui","i18n"," self.redbackRuntimeConfiguration().rbacManagerImpls.push(beanId); } - + var adminAvailableResponseFn = function(adminExists) { + $.log("admin exists "+adminExists); + if (adminExists) { + window.sammyArchivaApplication.runRoute("get","#redbackruntimeconfig"); + } else { + logout(); + displayWelcome(); + } + } $.log("rememberme enabled:"+self.redbackRuntimeConfiguration().findPropertyValue("security.rememberme.enabled")); $.ajax("restServices/archivaServices/redbackRuntimeConfigurationService/redbackRuntimeConfiguration", { @@ -1368,7 +1376,7 @@ define("archiva/admin/features/generaladmin/main",["jquery","jquery.ui","i18n"," dataType: 'json', success: function(data) { var message=$.i18n.prop('redback-runtime-configuration.updated'); - window.sammyArchivaApplication.runRoute("get","#redbackruntimeconfig"); + checkCreateAdminLink(adminAvailableResponseFn); displaySuccessMessage(message); }, error: function(data) { http://git-wip-us.apache.org/repos/asf/archiva/blob/f327eb9b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js index cd3f092..1d7dc71 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js @@ -825,14 +825,15 @@ function(jquery,ui,sammy,tmpl,i18n,jqueryCookie,bootstrap,archivaSearch,jqueryVa } else { createAdminLink.hide(); } - if(callbackFn){ - callbackFn() + if(callbackFn) { + callbackFn(adminExists) } $.log("adminExists:"+adminExists); } }); }; + // handle url with registration link checkUrlParams=function(){ var validateMeId = $.urlParam('validateMe');