Minor bug fixes (#305)

* Minor bug fixes - Can now disable dropdowns - Now have notes field in myaccount * Removed ability for user to view own notes field * Change as suggested
ctrlo · Dec 13, 2023 · 47d9054 · 47d9054
1 parent d01a24e
commit 47d9054
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/lib/GADS/Schema/Result/Site.pm b/lib/GADS/Schema/Result/Site.pm
@@ -283,6 +283,7 @@ sub user_fields
           description   => $self->account_request_notes_name || 'Notes',
           type          => 'textarea',
           placeholder   => $self->account_request_notes_placeholder || 'Notes',
+          user_hidden => 1,
         }
     );
     push @fields, {

diff --git a/views/fields/select_single.tt b/views/fields/select_single.tt
@@ -34,16 +34,19 @@
                   type="search"
                   class="form-control-search"
                   style="width:100px"
-                  placeholder="Search..."
+                  placeholder = [% is_disabled ? "Admin-Only" : "Search..."; %]
                   aria-controls="[% id %]-values-single"
                   aria-expanded="false"
                   aria-describedby="[% id %]-label"
+                  disabled=is_disabled
+                  aria-disabled=is_disabled
                 >
               </li>
             [% END %]
           </ul>
         </div>
 
+        [% IF !is_disabled; %]
         <ul hidden class="available select__menu dropdown-menu show [% with_details ? 'with-details' : ''; %]"
             id="[% id %]-values-single"
             aria-labelledby="[% id %]-label"
@@ -97,6 +100,8 @@
                 data-target=#detailsModal
                 data-record-id="[% item.value %]"
                 aria-described-by="lbl-single-details-0"
+                disabled=is_disabled
+                aria-disabled=is_disabled
               >
                 <span class="btn__title">Details</span>
               </button>
@@ -105,6 +110,7 @@
         </li>
         [% END; %]
       </ul>
+      [% END %]
     </div>
   </div>
 </fieldset>

diff --git a/views/user/my_account.tt b/views/user/my_account.tt
@@ -21,6 +21,7 @@
       <div class="row">
       [% END %]
       [% FOREACH field IN site.user_fields %]
+        [% NEXT IF field.user_hidden; %]
         [% IF field_counter > 0 AND field_counter % 2 == 0 %]
       </div>
       <div class="row">
@@ -66,11 +67,22 @@
                 is_disabled = field_disabled
                 sub_field = sub_field
                 sub_params = sub_params;
+            ELSIF field.type == "textarea";
+              INCLUDE fields/textarea.tt
+                id = field.name
+                name = field.name
+                value = user.${field.name}
+                label = field.description
+                placeholder = field.placeholder
+                filter = "html"
+                is_disabled = field_disabled
+                sub_field = sub_field
+                sub_params = sub_params;
             END;
           %]
         </div>
         [% IF field.name == "email"; field_counter = field_counter + 2; ELSE; field_counter = field_counter + 1; END; %]
-      [% END %]
+      [% END; %]
       [% IF site.user_fields.size > 0 %]
       </div>
       [% END %]