[freeside-commits] branch master updated. cbd61e030fc33f1b858aa874fc25e138d797b4f7

[Christopher Burger]

The branch, master has been updated
       via  cbd61e030fc33f1b858aa874fc25e138d797b4f7 (commit)
      from  5665dc8243598e7ca6567719b6e91efcfbbea209 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cbd61e030fc33f1b858aa874fc25e138d797b4f7
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Tue Aug 1 15:08:57 2017 -0400

    RT# 75817 - fixed enable selection to send password reset and to allow you to set password in one step

diff --git a/FS/FS/cust_contact.pm b/FS/FS/cust_contact.pm
index 6820ac4..118a9e0 100644
--- a/FS/FS/cust_contact.pm
+++ b/FS/FS/cust_contact.pm
@@ -106,7 +106,7 @@ and replace methods.
 sub check {
   my $self = shift;
 
-  if ( $self->selfservice_access eq 'R' || $self->selfservice_access eq 'P') {
+  if ( $self->selfservice_access eq 'R' || $self->selfservice_access eq 'E' || $self->selfservice_access eq 'P') {
     $self->selfservice_access('Y');
     $self->_resend('Y');
   }
diff --git a/httemplate/elements/contact.html b/httemplate/elements/contact.html
index 850c254..7d1f160 100644
--- a/httemplate/elements/contact.html
+++ b/httemplate/elements/contact.html
@@ -57,7 +57,7 @@
             >
               <OPTION VALUE="">Disabled
 %             if ( $value || $self_base_url ) {
-                <OPTION VALUE="Y" <% $value eq 'Y' ? 'SELECTED' : '' %>>Enabled
+                <OPTION VALUE="E" <% $value eq 'Y' ? 'SELECTED' : '' %>>Enabled
 %               if ( $value eq 'Y' && $self_base_url ) {
                   <OPTION VALUE="R">Re-email
                   <OPTION VALUE="P"><% $pwd_change_label %>
@@ -74,7 +74,7 @@
                   &>
             <SCRIPT TYPE="text/javascript">
                     document.getElementById("<%$id%>_<%$field%>").onchange = function() {
-                      if (this.value == "P") { changepw<%$id%>_toggle(true); }
+                      if (this.value == "P" || this.value == "E") { changepw<%$id%>_toggle(true); }
                       return false
                     }
             </SCRIPT>

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_contact.pm            |    2 +-
 httemplate/elements/contact.html |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)