You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/03/15 23:57:55 UTC

svn commit: r1301260 - /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html

Author: olamy
Date: Thu Mar 15 22:57:55 2012
New Revision: 1301260

URL: http://svn.apache.org/viewvc?rev=1301260&view=rev
Log:
prevent lock or set changePassword required for admin user

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html?rev=1301260&r1=1301259&r2=1301260&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html Thu Mar 15 22:57:55 2012
@@ -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}}