From 19c77bd46e3d0155b9f2a1afb7a3c488bc050f65 Mon Sep 17 00:00:00 2001 From: Jonathan Prykop Date: Mon, 11 Apr 2016 07:08:02 -0500 Subject: RT#40641: unprovisioning preserved cancelled services --- httemplate/elements/tr-cust_svc_cancel.html | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'httemplate/elements') diff --git a/httemplate/elements/tr-cust_svc_cancel.html b/httemplate/elements/tr-cust_svc_cancel.html index 44276ec82..52dedd6c8 100644 --- a/httemplate/elements/tr-cust_svc_cancel.html +++ b/httemplate/elements/tr-cust_svc_cancel.html @@ -18,7 +18,14 @@ for use in view/cust_main. % } -%# no action links, the service is canceled +%# no action links except unprovision, the service is canceled +% if ( $curuser->access_right('Unprovision customer service') && ! $opt{no_links} ) { + + + ( <% $svc_unprovision_link %> ) + + +% } <%init> my %opt = @_; @@ -29,4 +36,9 @@ my $part_svc = $opt{'part_svc'} || $cust_svc->part_svc; my $cust_pkg = $opt{'cust_pkg'} || $cust_svc->cust_pkg; my $svc_x = $cust_svc->svc_x; +my $svc_unprovision_link = + qq!!.emt('Unprovision').''; + -- cgit v1.2.1 From d65927fb45aa1c47d7f593db0142d14799b0fabf Mon Sep 17 00:00:00 2001 From: Jonathan Prykop Date: Thu, 14 Apr 2016 08:38:54 -0500 Subject: RT#41671 Fix double click prevention for all legacy buttons [renamed all from submit to submitButton] --- httemplate/elements/progress-init.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'httemplate/elements') diff --git a/httemplate/elements/progress-init.html b/httemplate/elements/progress-init.html index e38dde65f..ba2e6be0d 100644 --- a/httemplate/elements/progress-init.html +++ b/httemplate/elements/progress-init.html @@ -92,8 +92,8 @@ function <%$key%>process () { //alert('<%$key%>process for form <%$formname%>'); - if ( document.<%$formname%>.submit.disabled == false ) { - document.<%$formname%>.submit.disabled=true; + if ( document.<%$formname%>.submitButton.disabled == false ) { + document.<%$formname%>.submitButton.disabled=true; } overlib( 'Submitting job to server...', WIDTH, 444, HEIGHT, 168, CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 ); -- cgit v1.2.1 From 8eb6542c022ac84b125416f3fb0828b278ba600a Mon Sep 17 00:00:00 2001 From: Jonathan Prykop Date: Mon, 18 Apr 2016 13:26:59 -0500 Subject: Revert "RT#41671 Fix double click prevention for all legacy buttons [renamed all from submit to submitButton]" This reverts commit d65927fb45aa1c47d7f593db0142d14799b0fabf. --- httemplate/elements/progress-init.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'httemplate/elements') diff --git a/httemplate/elements/progress-init.html b/httemplate/elements/progress-init.html index ba2e6be0d..e38dde65f 100644 --- a/httemplate/elements/progress-init.html +++ b/httemplate/elements/progress-init.html @@ -92,8 +92,8 @@ function <%$key%>process () { //alert('<%$key%>process for form <%$formname%>'); - if ( document.<%$formname%>.submitButton.disabled == false ) { - document.<%$formname%>.submitButton.disabled=true; + if ( document.<%$formname%>.submit.disabled == false ) { + document.<%$formname%>.submit.disabled=true; } overlib( 'Submitting job to server...', WIDTH, 444, HEIGHT, 168, CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 ); -- cgit v1.2.1