Make user admin dynamic so that you can change your own permission level (#375)

Author: frankieroberto

app/views/user-admin/user-active.html app/views/user-admin/change.htmlapp/views/user-admin/user-active.html renamed to app/views/user-admin/change.html

@@ -1,8 +1,6 @@
 {% extends 'layout.html' %}
 
-{% block pageTitle %}
-  Add user
-{% endblock %}
+{% set pageName = "Change role for user" %}
 
 {% set currentSection = "manage-users" %}
 
@@ -19,22 +17,22 @@
   <div class="nhsuk-grid-row">
     <div class="nhsuk-grid-column-two-thirds">
 
-      <h1 class="nhsuk-heading-l">Ben Benson</h1>
+      <h1 class="nhsuk-heading-l">{{ user.firstName }} {{ user.lastName }}</h1>
 
       <dl class="nhsuk-summary-list">
         <div class="nhsuk-summary-list__row">
           <dt class="nhsuk-summary-list__key">
             Email
           </dt>
           <dd class="nhsuk-summary-list__value">
-            [email protected]
+            {{ user.email }}
           </dd>
         </div>
         <div class="nhsuk-summary-list__row">
           <dt class="nhsuk-summary-list__key">
             Last log in
           </dt>
-          <dd class="nhsuk-summary-list__value"> 
+          <dd class="nhsuk-summary-list__value">
             86 days ago
           </dd>
         </div>
@@ -49,7 +47,7 @@ <h1 class="nhsuk-heading-l">Ben Benson</h1>
             "legend": {
               "text": "Are they a clinician?",
               classes: "nhsuk-fieldset__legend--s"
-              
+
             }
           },
           hint: {
@@ -105,15 +103,11 @@ <h1 class="nhsuk-heading-l">Ben Benson</h1>
 
         <p>Do they still need an account? <a href="/user-admin/{{ user.id }}/deactivate">Deactivate this account</a></p>
 
-
-
         {{ button({
           "text": "Continue"
       }) }}
       </form>
 
-      
-
     </div>
   </div>
 

app/views/user-admin/deactivated.html

@@ -44,37 +44,37 @@ <h1 class="nhsuk-heading-xl">Manage users</h1>
 
       <div class="nhsuk-grid-row">
         <div class="nhsuk-grid-column-full">
-    
+
       <nav class="x-govuk-secondary-navigation" aria-label="Secondary menu">
         <ul class="x-govuk-secondary-navigation__list">
             <li class="x-govuk-secondary-navigation__list-item ">
-            <a class="x-govuk-secondary-navigation__link" href="/user-admin/index" aria-current=page>
-              Active (102)
+            <a class="x-govuk-secondary-navigation__link" href="/user-admin" aria-current=page>
+              Active (2)
             </a>
           </li>
           <li class="x-govuk-secondary-navigation__list-item x-govuk-secondary-navigation__list-item--current">
             <a class="x-govuk-secondary-navigation__link" href="/user-admin/deactivated">
               Deactivated (3)
             </a>
           </li>
-          
+
         </ul>
       </nav>
 
-    
-    
-    
+
+
+
           <table class="nhsuk-table-responsive" role="table">
 
             <br>
-    
+
 
             <caption class="nhsuk-table__caption">3 Deactivated users</caption>
 
             <thead class="nhsuk-table__head" role="rowgroup">
                 <thead role="rowgroup" class="nhsuk-table__head">
                     <tr role="row">
-          
+
                       <th role="columnheader" class="" scope="col">
                         Name
                       </th>
@@ -91,23 +91,23 @@ <h1 class="nhsuk-heading-xl">Manage users</h1>
                         Reason deactivated
                     </th>
                       <th role="columnheader" class="" scope="col">
-                        
+
                       </th>
-                      
+
                     </tr>
             </thead>
-    
+
             <tbody class="nhsuk-table__body">
-                  
+
               <tr role="row" class="nhsuk-table__row">
                 <td class="nhsuk-table__cell">
                     Doe, Jane
               </td>
-              
+
                 <td class="nhsuk-table__cell">
                   [email protected]
               </td>
-              
+
               <td class="nhsuk-table__cell">
                   Yes
               </td>
@@ -119,19 +119,19 @@ <h1 class="nhsuk-heading-xl">Manage users</h1>
             </td>
               <td class="nhsuk-table__cell nhsuk-table__cell--numeric">
                 <a class="nhsuk-link" href="/user-admin/reactivate">Reactivate</a>
-            </td> 
+            </td>
                 </tr>
 
 
                 <tr role="row" class="nhsuk-table__row">
                     <td class="nhsuk-table__cell">
                         West, Wallace
                   </td>
-                  
+
                     <td class="nhsuk-table__cell">
                     [email protected]
                   </td>
-                  
+
                   <td class="nhsuk-table__cell">
                       Yes
                   </td>
@@ -143,18 +143,18 @@ <h1 class="nhsuk-heading-xl">Manage users</h1>
                 </td>
                   <td class="nhsuk-table__cell nhsuk-table__cell--numeric">
                     <a class="nhsuk-link" href="/user-admin/reactivate">Reactivate</a>
-                  </td> 
+                  </td>
                     </tr>
 
                 <tr role="row" class="nhsuk-table__row">
                     <td class="nhsuk-table__cell">
                         Phillips, Zack
                   </td>
-                  
+
                     <td class="nhsuk-table__cell">
                     [email protected]
                   </td>
-                  
+
                   <td class="nhsuk-table__cell">
                       Yes
                   </td>
@@ -166,18 +166,18 @@ <h1 class="nhsuk-heading-xl">Manage users</h1>
                 </td>
                   <td class="nhsuk-table__cell nhsuk-table__cell--numeric">
                     <a class="nhsuk-link" href="/user-admin/reactivate">Reactivate</a>
-                  </td> 
+                  </td>
                     </tr>
 
-                
+
               </tbody>
             </table>
-    
-            
-            
+
+
+
         </div>
       </div>
-      
+
       <br>