projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
httemplate
/
edit
/
part_event.html
diff --git
a/httemplate/edit/part_event.html
b/httemplate/edit/part_event.html
index
e005cbb
..
47b8c1a
100644
(file)
--- a/
httemplate/edit/part_event.html
+++ b/
httemplate/edit/part_event.html
@@
-1,4
+1,4
@@
-<
% include( 'elements/edit.html'
,
+<
& elements/edit.html
,
'name' => 'Billing event definition',
'table' => 'part_event',
'fields' => [
'name' => 'Billing event definition',
'table' => 'part_event',
'fields' => [
@@
-82,8
+82,7
@@
'agent_virt' => 1,
'agent_null_right' => 'Edit global billing events',
'agent_virt' => 1,
'agent_null_right' => 'Edit global billing events',
- )
-%>
+&>
<SCRIPT TYPE="text/javascript">
window.onload = function () { eventtable_changed(document.getElementById('eventtable')) };
<SCRIPT TYPE="text/javascript">
window.onload = function () { eventtable_changed(document.getElementById('eventtable')) };
@@
-500,6
+499,9
@@
tie my %all_conditions, 'Tie::IxHash',
'' => { 'description' => '*** Select new condition ***', },
FS::part_event_condition->conditions();
'' => { 'description' => '*** Select new condition ***', },
FS::part_event_condition->conditions();
+# *** Select new condition *** sorts to the beginning anyway
+(tied %all_conditions)->SortByValue;
+
my %condition_labels = map { $_ => $all_conditions{$_}->{'description'} }
keys %all_conditions;
my %condition_labels = map { $_ => $all_conditions{$_}->{'description'} }
keys %all_conditions;
@@
-539,6
+541,8
@@
tie my %all_actions, 'Tie::IxHash',
'' => { 'description' => '*** Select event action ***', },
FS::part_event->actions();
'' => { 'description' => '*** Select event action ***', },
FS::part_event->actions();
+(tied %all_actions)->SortByValue;
+
my %action_labels = map { $_ => $all_actions{$_}->{'description'} }
keys %all_actions;
my %action_labels = map { $_ => $all_actions{$_}->{'description'} }
keys %all_actions;