diff options
author | Mark Wells <mark@freeside.biz> | 2014-12-06 09:50:32 -0800 |
---|---|---|
committer | Mark Wells <mark@freeside.biz> | 2014-12-06 09:50:32 -0800 |
commit | 715120170b58861d2957266a2802df2e412979c8 (patch) | |
tree | f480774d2c8e005c1bb5bbbe6ed0a1467a373112 /httemplate/elements | |
parent | 56efb22e0fe7adb1aebad517c6975edbf6e1c921 (diff) |
slightly more cautious fix for sorting the reason selector, #31702
Diffstat (limited to 'httemplate/elements')
-rw-r--r-- | httemplate/elements/select-table.html | 16 | ||||
-rwxr-xr-x | httemplate/elements/tr-select-reason.html | 5 |
2 files changed, 10 insertions, 11 deletions
diff --git a/httemplate/elements/select-table.html b/httemplate/elements/select-table.html index 5f36a36ef..3f6c8805d 100644 --- a/httemplate/elements/select-table.html +++ b/httemplate/elements/select-table.html @@ -9,6 +9,7 @@ Example: ## 'table' => 'table_name', 'name_col' => 'name_column', #or method if you pass an order_by + # order_by is currently broken, though #strongly recommended (you want your forms to be "sticky" on errors, right?) 'curr_value' => 'current_value', @@ -89,14 +90,13 @@ Example: <OPTION VALUE=""><% $opt{'empty_label'} || 'all' %> % } -%# foreach my $record ( sort { $a->$name_col() cmp $b->$name_col() -%# || $a->$key() <=> $b->$key() -%# } -%# @records -%# ) -%# { -% # show records in query order, or preserve the order they were given -% foreach my $record (@records) { +% # XXX fix this eventually, when we have time to test it +% foreach my $record ( sort { $a->$name_col() cmp $b->$name_col() +% || $a->$key() <=> $b->$key() +% } +% @records +% ) +% { % my $recvalue = $record->$key(); % my $selected; % if ( $opt{'all_selected'} ) { diff --git a/httemplate/elements/tr-select-reason.html b/httemplate/elements/tr-select-reason.html index 2dce9effe..52dc956d5 100755 --- a/httemplate/elements/tr-select-reason.html +++ b/httemplate/elements/tr-select-reason.html @@ -70,8 +70,7 @@ Example: 'id' => $id, 'table' => 'reason', 'records' => \@reasons, - 'label_callback' => sub { my $reason = shift; - $reason->type . ' : ' . $reason->reason }, + 'name_col' => 'label', 'disable_empty' => 1, 'pre_options' => [ 0 => 'Select reason...' ], 'post_options' => \@post_options, @@ -177,11 +176,11 @@ if ($class eq 'C') { my @reasons = qsearch({ 'table' => 'reason', + 'select' => "reason.*, (type || ' : ' || reason) AS label", 'addl_from' => ' LEFT JOIN reason_type'. ' ON (reason.reason_type = reason_type.typenum)', 'hashref' => { disabled => '' }, 'extra_sql' => " AND reason_type.class = '$class'", - 'order_by' => ' ORDER BY type, reason', }); my %all_hints; |