From 932b875eb70088bdaaddd788a322bc3648705fc8 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 15 Mar 2012 22:57:55 +0000 Subject: [PATCH] prevent lock or set changePassword required for admin user git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1301260 13f79535-47bb-0310-9956-ffa450edef68 --- .../js/redback/templates/user-grids.html | 41 +++++++++++-------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html index 73be56b54..b4b0b8d79 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html @@ -48,28 +48,35 @@ {{/if}} - {{if row.locked()==true}} - - - + {{if row.username()=="admin"}} + {{else}} - - - + {{if row.locked()==true}} + + + + {{else}} + + + + {{/if}} {{/if}} - - {{if row.passwordChangeRequired()==true}} + {{if row.username()=="admin"}} + + {{else}} + {{if row.passwordChangeRequired()==true}} + + + + + + {{else}} - - + + - {{else}} - - - - - + {{/if}} {{/if}} {{/each}} -- 2.39.5