summaryrefslogtreecommitdiff
path: root/httemplate
diff options
context:
space:
mode:
authorlevinse <levinse>2010-11-05 03:56:07 +0000
committerlevinse <levinse>2010-11-05 03:56:07 +0000
commit042d37f557e3ad0cf2f02753d20e70dfbd1f73a9 (patch)
tree6378701fc2924e3233ce72cc61f95c3d5e9f1eb0 /httemplate
parentd86c2687d55370e9aee258b7ed9b34ab181ffbf1 (diff)
add a multi-select for tags to advanced customer search, RT6376
Diffstat (limited to 'httemplate')
-rw-r--r--httemplate/elements/tr-select-cust_tag.html3
-rwxr-xr-xhttemplate/search/cust_main.html2
-rwxr-xr-xhttemplate/search/report_cust_main.html8
3 files changed, 11 insertions, 2 deletions
diff --git a/httemplate/elements/tr-select-cust_tag.html b/httemplate/elements/tr-select-cust_tag.html
index d88f3a8..b2b6d96 100644
--- a/httemplate/elements/tr-select-cust_tag.html
+++ b/httemplate/elements/tr-select-cust_tag.html
@@ -1,4 +1,4 @@
-% if ( $curuser->access_right('Edit customer tags') && @part_tag ) {
+% if ( ($curuser->access_right('Edit customer tags') && @part_tag) || $is_report ) {
<TR>
<TD ALIGN="right"><% $opt{'label'} || 'Tags' %></TD>
@@ -25,6 +25,7 @@ my $curuser = $FS::CurrentUser::CurrentUser;
my %opt = @_;
my $cgi = $opt{'cgi'};
+my $is_report = $opt{'is_report'};
my @curr_tagnum = ();
if ( $cgi->param('error') ) {
diff --git a/httemplate/search/cust_main.html b/httemplate/search/cust_main.html
index 5bfdf17..04ecf89 100755
--- a/httemplate/search/cust_main.html
+++ b/httemplate/search/cust_main.html
@@ -56,7 +56,7 @@ for my $param ( @scalars ) {
}
#lists
-for my $param (qw( classnum payby )) {
+for my $param (qw( classnum payby tagnum )) {
$search_hash{$param} = [ $cgi->param($param) ];
}
diff --git a/httemplate/search/report_cust_main.html b/httemplate/search/report_cust_main.html
index 03b3452..d6be4fb 100755
--- a/httemplate/search/report_cust_main.html
+++ b/httemplate/search/report_cust_main.html
@@ -50,6 +50,14 @@
% }
+ <% include( '/elements/tr-select-cust_tag.html',
+ 'cgi' => $cgi,
+ 'is_report' => 1,
+ 'multiple' => 1,
+ 'all_selected' => 1,
+ )
+ %>
+
<% include( '/elements/tr-select-payby.html',
'payby_type' => 'cust',
'multiple' => 1,