Fix after review

bitzesty · Apr 18, 2024 · c676950 · c676950
1 parent f6f77f3
commit c676950
Show file tree

Hide file tree

Showing 4 changed files with 287 additions and 258 deletions.
diff --git a/app/views/admin/lieutenants/index.html.slim b/app/views/admin/lieutenants/index.html.slim
@@ -25,20 +25,19 @@
         .govuk-grid-row
           = render "shared/users/search_count"
         .govuk-button-group
-          - if controller_name == "lieutenants"
-            - if action_name == "deleted"
-              = link_to "Show active users",
-                        admin_lieutenants_path,
-                        class: "new-user govuk-button pull-right",
-                        role: "button",
-                        aria: { label: "Show active users" }
+          - if action_name == "deleted"
+            = link_to "Show active users",
+                      admin_lieutenants_path,
+                      class: "new-user govuk-button pull-right",
+                      role: "button",
+                      aria: { label: "Show active users" }
 
-            - else
-              = link_to "Show deleted users",
-                        deleted_admin_lieutenants_path,
-                        class: "new-user govuk-button pull-right",
-                        role: "button",
-                        aria: { label: "Show deleted users" }
+          - else
+            = link_to "Show deleted users",
+                      deleted_admin_lieutenants_path,
+                      class: "new-user govuk-button pull-right",
+                      role: "button",
+                      aria: { label: "Show deleted users" }
 
           = link_to public_send("new_admin_#{controller_name.singularize}_path", search: params[:search], page: params[:page]), class: 'new-user govuk-button pull-right', role: 'button' do
             = t("admin.users.new_button.#{controller_name}")

diff --git a/app/views/admin/users/index.html.slim b/app/views/admin/users/index.html.slim
@@ -18,21 +18,6 @@
         .govuk-grid-row
           = render "shared/users/search_count"
         .govuk-button-group
-          - if controller_name == "lieutenants"
-            - if action_name == "deleted"
-              = link_to "Show active users",
-                        admin_lieutenants_path,
-                        class: "new-user govuk-button pull-right",
-                        role: "button",
-                        aria: { label: "Show active users" }
-
-            - else
-              = link_to "Show deleted users",
-                        deleted_admin_lieutenants_path,
-                        class: "new-user govuk-button pull-right",
-                        role: "button",
-                        aria: { label: "Show deleted users" }
-
           = link_to public_send("new_admin_#{controller_name.singularize}_path", search: params[:search], page: params[:page]), class: 'new-user govuk-button pull-right', role: 'button' do
             = t("admin.users.new_button.#{controller_name}")
         .clear

diff --git a/db/seeds.rb b/db/seeds.rb
@@ -3,7 +3,7 @@
 unless Admin.exists?
   admin_args = {
     email: "[email protected]",
-    password: SecureRandom.alphanumeric(12),
+    password: SecureRandom.alphanumeric(14),
     first_name: "First name",
     last_name: "Last name",
     confirmed_at: DateTime.now
@@ -17,7 +17,7 @@
   assessor_args = {
     email: "[email protected]",
     sub_group: "sub_group_1",
-    password: SecureRandom.alphanumeric(12),
+    password: SecureRandom.alphanumeric(14),
     first_name: "First name",
     last_name: "Last name",
     confirmed_at: DateTime.now