From b114ffd2c3d34c0760076e0d20d3278a7196bbcb Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Wed, 14 Dec 2022 14:48:59 -0500
Subject: [PATCH 1/2] Grey out button pw reset button for consistency

When user has no email in their profile, the box is greyed out for
consistency accross all buttons on the user profile
---
 resources/views/users/view.blade.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 17bc7bdf1..88f2d47f3 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -203,14 +203,16 @@
                 @endcan
 
                 @can('update', $user)
+                <div class="col-md-12" style="padding-top: 5px;">
                   @if (($user->activated == '1') && ($user->email != '') && ($user->ldap_import == '0'))
-                      <div class="col-md-12" style="padding-top: 5px;">
-                        <form action="{{ route('users.password',['userId'=> $user->id]) }}" method="POST">
+                      <form action="{{ route('users.password',['userId'=> $user->id]) }}" method="POST">
                           {{ csrf_field() }}
-                          <button style="width: 100%;" class="btn btn-sm btn-primary hidden-print">{{ trans('button.send_password_link') }}</button>
-                        </form>
-                      </div>
+                      <button style="width: 100%;" class="btn btn-sm btn-primary hidden-print">{{ trans('button.send_password_link') }}</button>
+                      </form>
+                  @elseif(($user->activated == '1') && ($user->ldap_import == '0'))
+                      <button style="width: 100%;" class="btn btn-sm btn-primary hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_email') }}">{{ trans('button.send_password_link') }}</button> 
                   @endif
+                  </div>
                 @endcan
 
                 @can('delete', $user)

From d870bc3b0226cc8d9403c76e5cf219482ce01e12 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Thu, 15 Dec 2022 14:19:51 -0500
Subject: [PATCH 2/2] nested if loop

---
 resources/views/users/view.blade.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 88f2d47f3..b220e2559 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -203,16 +203,18 @@
                 @endcan
 
                 @can('update', $user)
-                <div class="col-md-12" style="padding-top: 5px;">
-                  @if (($user->activated == '1') && ($user->email != '') && ($user->ldap_import == '0'))
+                  @if (($user->activated == '1') && ($user->ldap_import == '0'))
+                  <div class="col-md-12" style="padding-top: 5px;">
+                    @if($user->email != '')
                       <form action="{{ route('users.password',['userId'=> $user->id]) }}" method="POST">
                           {{ csrf_field() }}
                       <button style="width: 100%;" class="btn btn-sm btn-primary hidden-print">{{ trans('button.send_password_link') }}</button>
                       </form>
-                  @elseif(($user->activated == '1') && ($user->ldap_import == '0'))
+                    @else
                       <button style="width: 100%;" class="btn btn-sm btn-primary hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_email') }}">{{ trans('button.send_password_link') }}</button> 
-                  @endif
+                    @endif
                   </div>
+                  @endif
                 @endcan
 
                 @can('delete', $user)