From: Olivier Lamy <olamy@apache.org>
Date: Thu, 15 Mar 2012 22:57:55 +0000 (+0000)
Subject: prevent lock or set changePassword required for admin user
X-Git-Tag: archiva-1.4-M3~1030
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=932b875eb70088bdaaddd788a322bc3648705fc8;p=archiva.git

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
---

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 @@
               </a>
             </td>
           {{/if}}
-          {{if row.locked()==true}}
-            <td>
-              <a href="#" data-bind="click: function(){ unlock(row) }"><img src="images/system-lock-screen-22-22.png"/></a>
-            </td>
+          {{if row.username()=="admin"}}
+            <td></td>
           {{else}}
-            <td>
-              <a href="#" data-bind="click: function(){ lock(row) }"><img src="images/weather-clear-22-22.png"/></a>
-            </td>
+            {{if row.locked()==true}}
+              <td>
+                <a href="#" data-bind="click: function(){ unlock(row) }"><img src="images/system-lock-screen-22-22.png"/></a>
+              </td>
+            {{else}}
+              <td>
+                <a href="#" data-bind="click: function(){ lock(row) }"><img src="images/weather-clear-22-22.png"/></a>
+              </td>
+            {{/if}}
           {{/if}}
-
-          {{if row.passwordChangeRequired()==true}}
+          {{if row.username()=="admin"}}
+            <td></td>
+          {{else}}
+            {{if row.passwordChangeRequired()==true}}
+              <td>
+                <a href="#" data-bind="click: function(){ passwordChangeRequire(row,false) }">
+                  <img src="images/dialog-error-22-22.png"/>
+                </a>
+              </td>
+            {{else}}
             <td>
-              <a href="#" data-bind="click: function(){ passwordChangeRequire(row,false) }">
-                <img src="images/dialog-error-22-22.png"/>
+              <a href="#" data-bind="click: function(){ passwordChangeRequire(row,true) }">
+                <img src="images/weather-clear-22-22.png"/>
               </a>
             </td>
-          {{else}}
-          <td>
-            <a href="#" data-bind="click: function(){ passwordChangeRequire(row,true) }">
-              <img src="images/weather-clear-22-22.png"/>
-            </a>
-          </td>
+            {{/if}}
           {{/if}}
         </tr>
       {{/each}}