[freeside-commits] branch FREESIDE_4_BRANCH updated. 00fb90f744ceddb3b36bf2820b7279742cd3ae43
Ivan
ivan at 420.am
Fri Dec 4 19:45:03 PST 2015
The branch, FREESIDE_4_BRANCH has been updated
via 00fb90f744ceddb3b36bf2820b7279742cd3ae43 (commit)
from bd2049875ec183b1568bc18474878ff17e56aebf (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 00fb90f744ceddb3b36bf2820b7279742cd3ae43
Author: Ivan Kohler <ivan at freeside.biz>
Date: Fri Dec 4 19:45:02 2015 -0800
link to ticket, RT#34237
diff --git a/httemplate/misc/xmlhttp-ticket-update.html b/httemplate/misc/xmlhttp-ticket-update.html
index 46ed5bb..bd58b95 100644
--- a/httemplate/misc/xmlhttp-ticket-update.html
+++ b/httemplate/misc/xmlhttp-ticket-update.html
@@ -50,7 +50,7 @@ if ( $ticket ) {
'sched_label' =>
FS::sched_avail::pretty_time($sh*60+$sm). '-'.
FS::sched_avail::pretty_time($eh*60+$em). ': '.
- $cust_main[0]->_FreesideURILabel,
+ encode_entities($cust_main[0]->_FreesideURILabel),
};
} else {
$return = { 'error' => $smsg };
diff --git a/rt/share/html/Elements/CalendarSlotSchedule b/rt/share/html/Elements/CalendarSlotSchedule
index 943c8ba..4ff4767 100644
--- a/rt/share/html/Elements/CalendarSlotSchedule
+++ b/rt/share/html/Elements/CalendarSlotSchedule
@@ -20,6 +20,7 @@
%
% my $bgcolor = '666666;border-color:#555555';
% my $content = '';
+% my $link = '';
% my $selectable = 0;
% my $draggable_ticketid = 0;
% my $draggable_length = 0;
@@ -60,6 +61,7 @@
% FS::sched_avail::pretty_time($due).
% ': '. $cust_main[0]->_FreesideURILabel;
% #'install for custname XX miles away'; #XXX placeholder/more
+% $link = qq( <A HREF="$RT::WebPath/Ticket/Display.html?id=$id">view</A>);
% $draggable_ticketid = $id;
% $draggable_length = $due - $starts;
%
@@ -128,7 +130,7 @@
% }
%
% }
- ><% $content |h %></td>
+ ><% $content |h %><% $link |n %></td>
<SCRIPT TYPE="text/javascript">
$('#<% $td_id %>').data('username', "<% $username %>");
diff --git a/rt/share/html/Search/Schedule.html b/rt/share/html/Search/Schedule.html
index 726b5cc..f021df7 100644
--- a/rt/share/html/Search/Schedule.html
+++ b/rt/share/html/Search/Schedule.html
@@ -175,7 +175,7 @@
% #remove their droppable
$('#'+n_td_id).droppable('destroy');
if ( d == 0 ) {
- $('#'+n_td_id).text(label);
+ $('#'+n_td_id).html(label + ' <A HREF="<%$RT::WebPath%>/Ticket/Display.html?id=' + ticketid + '">view</A>' );
% #(and make the top draggable, so we could do it all over again)
$('#'+n_td_id).draggable({
containment: '.titlebox-content',
-----------------------------------------------------------------------
Summary of changes:
httemplate/misc/xmlhttp-ticket-update.html | 2 +-
rt/share/html/Elements/CalendarSlotSchedule | 4 +++-
rt/share/html/Search/Schedule.html | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
More information about the freeside-commits
mailing list