[freeside-commits] branch master updated. 20729c347f88e5380b9309ad3f7dd452970b5c3a

[Ivan]

The branch, master has been updated
       via  20729c347f88e5380b9309ad3f7dd452970b5c3a (commit)
       via  1598480a192e9a056834d636fbd7de7ae00dead6 (commit)
      from  31dfca5cd65c92b9dce0af6d41db394b17ac0bf4 (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 20729c347f88e5380b9309ad3f7dd452970b5c3a
Merge: 1598480 31dfca5
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Oct 29 10:52:23 2015 -0700

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit 1598480a192e9a056834d636fbd7de7ae00dead6
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Oct 29 10:52:04 2015 -0700

    fix appointments vs. no direct elements/ access, RT#34237, RT#23357

diff --git a/httemplate/elements/popup_link-make_appointment.html b/httemplate/elements/popup_link-make_appointment.html
index 60a337c..3a8d37a 100644
--- a/httemplate/elements/popup_link-make_appointment.html
+++ b/httemplate/elements/popup_link-make_appointment.html
@@ -26,6 +26,6 @@ $params->{'actionlabel'} ||= 'Schedule appointment';
 #$params->{'width'} ||= 350;
 #$params->{'height'} ||= 220;
 
-$params->{'action'} = $p. '/elements/make_appointment.html?custnum='. $params->{'custnum'};
+$params->{'action'} = $p. 'misc/make_appointment.html?custnum='. $params->{'custnum'};
 
 </%init>
diff --git a/httemplate/elements/make_appointment.html b/httemplate/misc/make_appointment.html
similarity index 100%
rename from httemplate/elements/make_appointment.html
rename to httemplate/misc/make_appointment.html
diff --git a/httemplate/view/cust_main/menu.html b/httemplate/view/cust_main/menu.html
index b874063..ab2d69d 100644
--- a/httemplate/view/cust_main/menu.html
+++ b/httemplate/view/cust_main/menu.html
@@ -317,7 +317,7 @@ my @menu = (
       label       => 'Schedule new appointment',
       confexists  => 'ticket_system',
       acl        => 'Make appointment',
-      popup       => "elements/make_appointment.html?custnum=$custnum",
+      popup       => "misc/make_appointment.html?custnum=$custnum",
       actionlabel => 'Schedule appointment',
     },
   ],

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

Summary of changes:
 httemplate/elements/popup_link-make_appointment.html |    2 +-
 httemplate/{elements => misc}/make_appointment.html  |    0
 httemplate/view/cust_main/menu.html                  |    2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename httemplate/{elements => misc}/make_appointment.html (100%)