[Rt-commit] rt branch, 4.6/row-colors-by-condition, created. rt-4.4.3-85-gf4af2044a8
Craig Kaiser
craig at bestpractical.com
Mon Dec 31 12:00:24 EST 2018
The branch, 4.6/row-colors-by-condition has been created
at f4af2044a862f75d2b80f31be5dbcdbe775cb8c0 (commit)
- Log -----------------------------------------------------------------
commit 81390e43fa402b9faf31807ed76810461decf3ed
Author: Craig Kaiser <craig at bestpractical.com>
Date: Fri Sep 7 08:44:33 2018 -0400
Create ReplaceAttachments, ReplaceHeader and ReplaceContent Methods
Quickly search on the attachments table and remove or replace matching
data found.
diff --git a/lib/RT/Attachment.pm b/lib/RT/Attachment.pm
index 4c544301c7..5708e31428 100644
--- a/lib/RT/Attachment.pm
+++ b/lib/RT/Attachment.pm
@@ -743,6 +743,62 @@ sub SetHeader {
$self->__Set( Field => 'Headers', Value => $newheader);
}
+=head2 ReplaceHeaders ( Search => 'SEARCH', Replacement => 'Replacement' )
+
+Search the attachments table's Header column for the search string provided.
+When a match is found call the SetHeader() method on the header with the match,
+either set the header to empty or a replacement value.
+
+=cut
+
+sub ReplaceHeaders {
+ my $self = shift;
+ my %args = (
+ Search => undef,
+ Replacement => '',
+ @_,
+ );
+
+ return ( 0, $self->loc('No Search string provided') ) unless $args{Search};
+
+ foreach my $header ( $self->SplitHeaders ) {
+ my ( $tag, $value ) = split /:/, $header, 2;
+ if ( $value =~ s/\Q$args{Search}\E/$args{Replacement}/ig ) {
+ my $ret = $self->SetHeader( $tag, $value );
+ RT::Logger->error("Could not set header: $tag to $value") unless $ret;
+ }
+ }
+ return ( 1, $self->loc('Headers cleared') );
+}
+
+=head2 ReplaceContent ( Search => 'SEARCH', Replacement => 'Replacement' )
+
+Search the attachments table's Content column for the search string provided.
+When a match is found either replace it with the provided replacement string or an
+empty string.
+
+=cut
+
+sub ReplaceContent {
+ my $self = shift;
+ my %args = (
+ Search => undef,
+ Replacement => '',
+ @_,
+ );
+
+ return ( 0, $self->loc('No search string provided') ) unless $args{Search};
+
+ my $content = $self->Content;
+
+ if ( $content && $content =~ s/\Q$args{Search}\E/$args{Replacement}/ig ) {
+ my ( $ret, $msg ) = $self->_Set( Field => 'Content', Value => $content );
+ return ( $ret, 'Content replaced' );
+ }
+ return ( 1, $self->loc('No content matches found') );
+}
+
+
sub _CanonicalizeHeaderValue {
my $self = shift;
my $value = shift;
diff --git a/lib/RT/Attachments.pm b/lib/RT/Attachments.pm
index 8b06088678..a4b070e2cd 100644
--- a/lib/RT/Attachments.pm
+++ b/lib/RT/Attachments.pm
@@ -252,6 +252,81 @@ sub AddRecord {
return $self->SUPER::AddRecord( $record );
}
+=head2 ReplaceAttachments ( Search => 'SEARCH', Replacement => 'Replacement', Header => 1, Content => 1 )
+
+Provide a search string to search the attachments table for, by default the Headers and Content
+columns will both be searched for matches.
+
+=cut
+
+sub ReplaceAttachments {
+ my $self = shift;
+ my %args = (
+ Search => undef,
+ Replacement => '',
+ Headers => 1,
+ Content => 1,
+ @_,
+ );
+
+ return ( 0, $self->loc('Provide a search string to search on') ) unless $args{Search};
+
+ $self->Limit(
+ ENTRYAGGREGATOR => 'OR',
+ FIELD => 'Headers',
+ OPERATOR => 'LIKE',
+ VALUE => $args{Search},
+ SUBCLAUSE => 'Attachments',
+ ) if $args{Headers};
+ $self->Limit(
+ ENTRYAGGREGATOR => 'OR',
+ FIELD => 'Content',
+ OPERATOR => 'LIKE',
+ VALUE => $args{Search},
+ SUBCLAUSE => 'Attachments',
+ ) if $args{Content};
+ $self->Limit(
+ FIELD => 'ContentType',
+ OPERATOR => 'IN',
+ VALUE => ['text/plain', 'text/html'],
+ );
+ $self->Limit(
+ FIELD => 'ContentEncoding',
+ VALUE => 'none',
+ );
+
+ my %tickets;
+ my ($ret, $msg);
+ while (my $attachment = $self->Next) {
+ my $content_replaced;
+ if ( $args{Headers} ) {
+ ($ret, $msg) = $attachment->ReplaceHeaders(Search => $args{Search}, Replacement => $args{Replacement});
+ $content_replaced ||= $ret;
+
+ RT::Logger->error($msg) unless $ret;
+ }
+
+ if ( $args{Content} ) {
+ ($ret, $msg) = $attachment->ReplaceContent(Search => $args{Search}, Replacement => $args{Replacement});
+ $content_replaced ||= $ret;
+
+ RT::Logger->error($msg) unless $ret;
+ }
+
+ my $ticket = $attachment->TransactionObj->TicketObj;
+ $tickets{$ticket->Id} ||= $ticket if $content_replaced;
+ }
+
+ foreach my $id ( sort { $a <=> $b } keys %tickets ) {
+ (my $transaction, $msg, my $trans) = $tickets{$id}->_NewTransaction (
+ Type => "Munge",
+ );
+ RT::Logger->error($msg) unless $transaction;
+ }
+ my $count = scalar keys %tickets;
+ return ( 1, $self->loc( "Updated [_1] ticket's attachment content", $count ) );
+}
+
RT::Base->_ImportOverlays();
1;
diff --git a/lib/RT/Transaction.pm b/lib/RT/Transaction.pm
index 9f897c307d..c88f43f9d6 100644
--- a/lib/RT/Transaction.pm
+++ b/lib/RT/Transaction.pm
@@ -1373,6 +1373,10 @@ sub _CanonicalizeRoleName {
$principal->Load($self->Field);
return ("Removed from group '[_1]'", $principal->Object->Name); #loc()
},
+ Munge => sub {
+ my $self = shift;
+ return "Attachment content modified";
+ },
);
commit 5bec6babaebd076cc059c63287667c1fd7269caf
Author: Craig Kaiser <craig at bestpractical.com>
Date: Fri Sep 7 08:45:39 2018 -0400
Create rt-munge-attachments executable
diff --git a/.gitignore b/.gitignore
index 1159ee89cc..ff1a7110d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,7 @@
/sbin/rt-ldapimport
/sbin/rt-passwd
/sbin/standalone_httpd
+/sbin/rt-munge-attachments
/var/mason_data/
/autom4te.cache/
/configure
diff --git a/Makefile.in b/Makefile.in
index cc418241f0..e704069278 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -139,6 +139,7 @@ BINARIES = $(RT_MAILGATE_BIN) \
$(RT_CRON_BIN)
SYSTEM_BINARIES = rt-attributes-viewer \
+ rt-munge-attachments \
rt-clean-sessions \
rt-dump-metadata \
rt-email-dashboards \
diff --git a/configure.ac b/configure.ac
index d7685d80d1..4c6e34b6aa 100755
--- a/configure.ac
+++ b/configure.ac
@@ -486,6 +486,7 @@ AC_CONFIG_FILES([
sbin/rt-serializer
sbin/rt-importer
sbin/rt-passwd
+ sbin/rt-munge-attachments
bin/rt-crontool
bin/rt-mailgate
bin/rt],
diff --git a/sbin/rt-munge-attachments.in b/sbin/rt-munge-attachments.in
new file mode 100644
index 0000000000..2a3eec9692
--- /dev/null
+++ b/sbin/rt-munge-attachments.in
@@ -0,0 +1,123 @@
+#!@PERL@
+# BEGIN BPS TAGGED BLOCK {{{
+#
+# COPYRIGHT:
+#
+# This software is Copyright (c) 1996-2018 Best Practical Solutions, LLC
+# <sales at bestpractical.com>
+#
+# (Except where explicitly superseded by other copyright notices)
+#
+#
+# LICENSE:
+#
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+#
+# This work is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 or visit their web page on the internet at
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
+#
+#
+# CONTRIBUTION SUBMISSION POLICY:
+#
+# (The following paragraph is not intended to limit the rights granted
+# to you to modify and distribute this software under the terms of
+# the GNU General Public License and is only of importance to you if
+# you choose to contribute your changes and enhancements to the
+# community by submitting them to Best Practical Solutions, LLC.)
+#
+# By intentionally submitting any modifications, corrections or
+# derivatives to this work, or any other work intended for use with
+# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+# you are the copyright holder for those contributions and you grant
+# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable,
+# royalty-free, perpetual, license to use, copy, create derivative
+# works based on those contributions, and sublicense and distribute
+# those contributions and any derivatives thereof.
+#
+# END BPS TAGGED BLOCK }}}
+use strict;
+use warnings;
+
+# fix lib paths, some may be relative
+BEGIN { # BEGIN RT CMD BOILERPLATE
+ require File::Spec;
+ require Cwd;
+ my @libs = ( "@RT_LIB_PATH@", "@LOCAL_LIB_PATH@" );
+ my $bin_path;
+
+ for my $lib (@libs) {
+ unless ( File::Spec->file_name_is_absolute($lib) ) {
+ $bin_path
+ ||= ( File::Spec->splitpath( Cwd::abs_path(__FILE__) ) )[1];
+ $lib = File::Spec->catfile( $bin_path, File::Spec->updir, $lib );
+ }
+ unshift @INC, $lib;
+ }
+
+}
+
+# Read in the options
+my %opts;
+use Getopt::Long;
+GetOptions( \%opts, "help|h", "search=s", "replacement=s", );
+
+if ( $opts{'help'} || !$opts{'search'} ) {
+ require Pod::Usage;
+ print Pod::Usage::pod2usage( -verbose => 2 );
+ exit;
+}
+
+use RT -init;
+
+my $replacement = $opts{'replacement'} || '';
+
+my $search = $opts{'search'};
+
+my $attachments = RT::Attachments->new( RT->SystemUser );
+my ($ret, $msg) = $attachments->ReplaceAttachments(Search => $search, Replacement => $replacement);
+
+print STDERR $msg . "\n";
+
+
+=head1 rt-munge-attachments
+
+rt-munge-attachments - Remove or replace string from attachments table.
+
+=head1 SYNOPSIS
+
+ rt-munge-attachments --search="user1 at example.com" --replace="Ex-Employee"
+
+=cut
+
+=head1 DESCRIPTION
+
+When a match is found in the Headers column, the header is deleted unless a replacement
+value was provided. If a match is found in the Content column then the matching substring
+will be replaced with a blank or provided value.
+
+=head1 OPTIONS
+
+=over 2
+
+=item --search=SEARCH
+
+Provide a string to search the header and content columns in the attachments table, if a match
+is found the content will be removed.
+
+=item --replace=REPLACEMENT
+
+Provide a string to replace strings matching the search string for the
+attachments table.
+
+=back
commit 765817052ed41f8b69f6017137b86f136bb5450e
Author: Craig Kaiser <craig at bestpractical.com>
Date: Fri Sep 7 08:45:59 2018 -0400
Add tests for methods that munge the attachments table
diff --git a/t/api/attachment.t b/t/api/attachment.t
index 52e3c3f162..25d736b8bf 100644
--- a/t/api/attachment.t
+++ b/t/api/attachment.t
@@ -2,7 +2,7 @@
use strict;
use warnings;
use RT;
-use RT::Test tests => 7;
+use RT::Test tests => undef;
{
@@ -64,3 +64,95 @@ is ($#headers, 2, "testing a bunch of singline multiple headers" );
'body of ContentAsMIME is original'
);
}
+
+diag 'Test clearing and replacing header and content in attachments table';
+{
+ my $queue = RT::Test->load_or_create_queue( Name => 'General' );
+ ok $queue && $queue->id, 'loaded or created queue';
+
+ my $t = RT::Test->create_ticket( Queue => 'General', Subject => 'test' );
+ ok $t && $t->id, 'created a ticket';
+
+ $t->Comment( Content => 'test' );
+
+ my $attachments = RT::Attachments->new(RT->SystemUser);
+ $attachments->Limit(
+ FIELD => 'Content',
+ OPERATOR => 'LIKE',
+ VALUE => 'test',
+ );
+ is $attachments->Count, 1, 'Found content with "test"';
+
+ # Replace attachment value for 'test' in Conetent col
+ my ($ret, $msg) = $attachments->ReplaceAttachments(Search => 'test', Replacement => 'new_value', Headers => 0);
+ ok $ret, $msg;
+
+ $attachments->CleanSlate;
+
+ $attachments->Limit(
+ FIELD => 'Content',
+ OPERATOR => 'LIKE',
+ VALUE => 'test',
+ );
+ is $attachments->Count, 0, 'Found no content with "test"';
+
+ $attachments->Limit(
+ FIELD => 'Content',
+ OPERATOR => 'LIKE',
+ VALUE => 'new_value',
+ );
+ is $attachments->Count, 1, 'Found content with "new_value"';
+
+ $attachments->CleanSlate;
+
+ $attachments->Limit(
+ FIELD => 'Headers',
+ OPERATOR => 'LIKE',
+ VALUE => 'API',
+ );
+ is $attachments->Count, 1, 'Found header with content "API"';
+
+ # Replace attachment value for 'API' in Header col
+ ($ret, $msg) = $attachments->ReplaceAttachments(Search => 'API', Replacement => 'replacement', Content => 0);
+ ok $ret, $msg;
+ $attachments->CleanSlate;
+
+ $attachments->Limit(
+ FIELD => 'Headers',
+ OPERATOR => 'LIKE',
+ VALUE => 'API',
+ );
+ is $attachments->Count, 0, 'Found no header with content "API"';
+ $attachments->CleanSlate;
+
+ $attachments->Limit(
+ FIELD => 'Headers',
+ OPERATOR => 'LIKE',
+ VALUE => 'replacement',
+ );
+ is $attachments->Count, 1, 'Found header with content "replacement"';
+
+ ($ret, $msg) = $attachments->ReplaceAttachments(Search => 'new_value', Replacement => 'replacement', Content => 0);
+ ok $ret, $msg;
+
+ $attachments->CleanSlate;
+ $attachments->Limit(
+ FIELD => 'Content',
+ OPERATOR => 'LIKE',
+ VALUE => 'new_value',
+ );
+ is $attachments->Count, 1, 'Content is not changed when flagged as false';
+
+ ($ret, $msg) = $attachments->ReplaceAttachments(Search => 'replacement', Replacement => 'new_value', Headers => 0);
+ ok $ret, $msg;
+
+ $attachments->CleanSlate;
+ $attachments->Limit(
+ FIELD => 'Headers',
+ OPERATOR => 'LIKE',
+ VALUE => 'replacement',
+ );
+ is $attachments->Count, 1, 'Headers are not replaced when flagged as false';
+}
+
+done_testing();
commit f4af2044a862f75d2b80f31be5dbcdbe775cb8c0
Author: Craig Kaiser <craig at bestpractical.com>
Date: Thu Dec 20 08:35:09 2018 -0500
Inital commit
diff --git a/lib/RT/Config.pm b/lib/RT/Config.pm
index 17d63b548b..539f1962a0 100644
--- a/lib/RT/Config.pm
+++ b/lib/RT/Config.pm
@@ -1222,6 +1222,14 @@ our %META;
ServiceAgreements => {
Type => 'HASH',
},
+ HighlightRowColor => {
+ Section => 'User Color Preferences', #loc
+ Overridable => 1,
+ Widget => '/Widgets/Form/Criteria',
+ WidgetArguments => {
+ Description => 'Select conditions for row coloring' # loc
+ }
+ },
);
my %OPTIONS = ();
my @LOADED_CONFIGS = ();
diff --git a/lib/RT/Record.pm b/lib/RT/Record.pm
index 908cde342a..0d3fd684cc 100644
--- a/lib/RT/Record.pm
+++ b/lib/RT/Record.pm
@@ -2695,6 +2695,39 @@ sub __DependsOn
return;
}
+=head2 HighLightOnCondition
+
+Add css class to collection row if user prefs criteria are met.
+
+=cut
+
+sub HighLightOnCondition {
+ my $self = shift;
+
+ my $user = RT::User->new($self->CurrentUser);
+ my ($ret, $msg) = $user->Load($self->CurrentUser);
+ RT::Logger->error($msg) unless $ret;
+
+ my $preferences = $user->Preferences($RT::System);
+
+ my @classes;
+
+ my %color_config = %{$preferences->{'HighlightRowColor'}};
+
+ foreach my $condition (keys %color_config) {
+ my ($attr, $value) = $condition =~ /(.*)-(.*)/;
+ if ( !$self->_CoreAccessible->{$attr} ) {
+ next;
+ } else {
+ if ( $self->$attr eq $value ) {
+ push @classes, "row-bg-color-". $color_config{$condition}->{color};
+ }
+ }
+ }
+
+ return \@classes;
+}
+
# implement proxy method because some RT classes
# override Delete method
sub __Wipeout
diff --git a/share/html/Elements/CollectionList b/share/html/Elements/CollectionList
index a33b8e0fd9..d9770454b3 100644
--- a/share/html/Elements/CollectionList
+++ b/share/html/Elements/CollectionList
@@ -145,6 +145,9 @@ while ( my $record = $Collection->Next ) {
my $warning = 0;
my $Classes = '';
+ my $row_coloring = $record->HighLightOnCondition();
+ $Classes = join(' ', @{$row_coloring}) if $row_coloring;
+
$m->callback(
CallbackName => 'EachRow',
Record => $record,
diff --git a/share/html/Elements/SelectColor b/share/html/Elements/SelectColor
new file mode 100644
index 0000000000..1216cad07f
--- /dev/null
+++ b/share/html/Elements/SelectColor
@@ -0,0 +1,64 @@
+%# BEGIN BPS TAGGED BLOCK {{{
+%#
+%# COPYRIGHT:
+%#
+%# This software is Copyright (c) 1996-2018 Best Practical Solutions, LLC
+%# <sales at bestpractical.com>
+%#
+%# (Except where explicitly superseded by other copyright notices)
+%#
+%#
+%# LICENSE:
+%#
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%#
+%# This work is distributed in the hope that it will be useful, but
+%# WITHOUT ANY WARRANTY; without even the implied warranty of
+%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+%# General Public License for more details.
+%#
+%# You should have received a copy of the GNU General Public License
+%# along with this program; if not, write to the Free Software
+%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+%# 02110-1301 or visit their web page on the internet at
+%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
+%#
+%#
+%# CONTRIBUTION SUBMISSION POLICY:
+%#
+%# (The following paragraph is not intended to limit the rights granted
+%# to you to modify and distribute this software under the terms of
+%# the GNU General Public License and is only of importance to you if
+%# you choose to contribute your changes and enhancements to the
+%# community by submitting them to Best Practical Solutions, LLC.)
+%#
+%# By intentionally submitting any modifications, corrections or
+%# derivatives to this work, or any other work intended for use with
+%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+%# you are the copyright holder for those contributions and you grant
+%# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable,
+%# royalty-free, perpetual, license to use, copy, create derivative
+%# works based on those contributions, and sublicense and distribute
+%# those contributions and any derivatives thereof.
+%#
+%# END BPS TAGGED BLOCK }}}
+<select name="<% $Name %>">
+ <option value="" selected="selected">(no value)</option>
+% foreach my $color (@Colors) {
+ <option value="<% $color %>"
+% if ($Default && $Default eq $color) {
+ selected="selected"
+% }
+ ><% $color %>
+ </option>
+% }
+</select>
+
+<%ARGS>
+$Name => ''
+$Default => ''
+ at Colors => qw/blue green yellow purple grey red/
+</%ARGS>
diff --git a/share/html/Widgets/Form/Criteria b/share/html/Widgets/Form/Criteria
new file mode 100644
index 0000000000..41ff6e1768
--- /dev/null
+++ b/share/html/Widgets/Form/Criteria
@@ -0,0 +1,137 @@
+%# BEGIN BPS TAGGED BLOCK {{{
+%#
+%# COPYRIGHT:
+%#
+%# This software is Copyright (c) 1996-2018 Best Practical Solutions, LLC
+%# <sales at bestpractical.com>
+%#
+%# (Except where explicitly superseded by other copyright notices)
+%#
+%#
+%# LICENSE:
+%#
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%#
+%# This work is distributed in the hope that it will be useful, but
+%# WITHOUT ANY WARRANTY; without even the implied warranty of
+%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+%# General Public License for more details.
+%#
+%# You should have received a copy of the GNU General Public License
+%# along with this program; if not, write to the Free Software
+%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+%# 02110-1301 or visit their web page on the internet at
+%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
+%#
+%#
+%# CONTRIBUTION SUBMISSION POLICY:
+%#
+%# (The following paragraph is not intended to limit the rights granted
+%# to you to modify and distribute this software under the terms of
+%# the GNU General Public License and is only of importance to you if
+%# you choose to contribute your changes and enhancements to the
+%# community by submitting them to Best Practical Solutions, LLC.)
+%#
+%# By intentionally submitting any modifications, corrections or
+%# derivatives to this work, or any other work intended for use with
+%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+%# you are the copyright holder for those contributions and you grant
+%# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable,
+%# royalty-free, perpetual, license to use, copy, create derivative
+%# works based on those contributions, and sublicense and distribute
+%# those contributions and any derivatives thereof.
+%#
+%# END BPS TAGGED BLOCK }}}
+<div>
+% my $i = 0;
+% foreach my $color (@colors) {
+ <div>
+ <select name="Color-Arguement-<%$i%>" class="cascade-by-optgroup">
+% if ( $defaults{$i}->{attribute} ) {
+ <option value="<% $defaults{$i}->{attribute} %>"><% $defaults{$i}->{value} %></option>
+% } else {
+ <optgroup label="-"></optgroup>
+% }
+ <optgroup label="Status">
+% foreach my $status (@statuses) {
+ <option value="<% $status %>"><% $status %></option>
+% }
+ </optgroup>
+ </select>
+ <& /Elements/SelectColor, Name => "Color-$i", Default => $defaults{$i}->{color} &>
+ </div>
+% $i++;
+% }
+</div>
+<%INIT>
+my @colors = qw/blue green yellow purple grey red/;
+
+my @lifecycles = RT::Lifecycle->new($session{CurrentUser})->ListAll;
+my @lifecycle_objs;
+
+my $LoadLifecycle = sub {
+ my $lifecycle_name = shift;
+
+ my $lifecycle = RT::Lifecycle->new($session{CurrentUser});
+ $lifecycle->Load($lifecycle_name);
+
+ return $lifecycle;
+};
+
+map { push @lifecycle_objs, $LoadLifecycle->($_) unless $_ eq 'approvals' } @lifecycles;
+
+my @statuses;
+foreach my $lifecycle (@lifecycle_objs) {
+ my @temp_statuses = $lifecycle->Valid;
+ push @statuses, @temp_statuses;
+}
+
+my %defaults;
+foreach my $key (keys %{$ARGS{'CurrentValue'}}) {
+ if ( $ARGS{'CurrentValue'}{$key}{'attribute'} eq 'Queue' ) {
+ my $queueObj = RT::Queue->new($session{CurrentUser});
+ $queueObj->Load($ARGS{'CurrentValue'}{$key}{'value'});
+
+ $ARGS{'CurrentValue'}{$key}{'attribute'} = $queueObj->Name;
+ }
+
+ $defaults{$ARGS{'CurrentValue'}{$key}{'input_id'}} = {
+ value => $ARGS{'CurrentValue'}{$key}{'value'},
+ color => $ARGS{'CurrentValue'}{$key}{'color'},
+ attribute => $ARGS{'CurrentValue'}{$key}{'attribute'}
+ };
+}
+</%INIT>
+
+<%METHOD Process>
+<%ARGS>
+</%ARGS>
+<%INIT>
+my %args = %{$ARGS{Arguments}};
+my @color_arguements = grep /Color-Arguement-(\d*[^\'"'])/, keys %args;
+
+my %config;
+foreach my $color_arg (@color_arguements) {
+ next unless $args{$color_arg};
+
+ $color_arg =~ /Color-Arguement-(\d*[^\"])(?-)/;
+
+ my $value = $args{"Color-Arguement-$1"};
+ my $attribute = $args{"Color-Arguement-$1-Groups"};
+
+ next unless $value and $attribute;
+
+ $config{$attribute . '-' . $value} = {
+ color => $args{'Color-'.$1},
+ input_id => $1,
+ value => $value,
+ attribute => $attribute,
+ };
+}
+
+return \%config;
+</%INIT>
+</%METHOD>
diff --git a/share/static/css/base/highlight.css b/share/static/css/base/highlight.css
new file mode 100644
index 0000000000..6bf90a03dc
--- /dev/null
+++ b/share/static/css/base/highlight.css
@@ -0,0 +1,48 @@
+/* unset even and odd line colors. */
+tr.rowhighlight {background-color:#f0f8ff;margin:0;border:0;padding:0;spacing:0 !important; }
+
+/* bg colors from highlight. */
+tr.row-bg-color-red td {
+ background-color: rgba(255, 85, 102, 0.1) !important
+}
+
+tr.row-bg-color-blue td {
+ background-color: rgba(0, 149, 191, 0.1) !important
+}
+
+tr.row-bg-color-green td {
+ background-color: rgba(68, 187, 119, 0.1) !important
+}
+
+tr.row-bg-color-yellow td {
+ background-color: rgba(255, 170, 68, 0.1) !important
+}
+
+tr.row-bg-color-purple td {
+ background-color: rgba(170, 68, 255, 0.1) !important
+}
+
+tr.row-bg-color-grey td {
+ background-color: rgba(153, 153, 153, 0.1) !important
+}
+
+/* Status Colours */
+tr.statusnew td {
+ background-color: rgba(255, 85, 102, 0.1) !important
+}
+
+tr.statusopen td {
+ background-color: rgba(255, 170, 68, 0.1) !important
+}
+
+tr.statusstalled td {
+ background-color: rgba(170, 68, 255, 0.1) !important
+}
+
+tr.statusresolved td {
+ background-color: rgba(68, 187, 119, 0.1) !important
+}
+
+tr.statusrejected td {
+ background-color: rgba(153, 153, 153, 0.1) !important
+}
diff --git a/share/static/css/base/main.css b/share/static/css/base/main.css
index 7cc29066bf..3e4ef4ea4c 100644
--- a/share/static/css/base/main.css
+++ b/share/static/css/base/main.css
@@ -1,3 +1,4 @@
+ at import "highlight.css";
@import "yui-fonts.css";
@import "jquery-ui.css";
@import "jquery-ui-timepicker-addon.css";
diff --git a/share/static/css/base/misc.css b/share/static/css/base/misc.css
index 25ec20c699..91bb95d56d 100644
--- a/share/static/css/base/misc.css
+++ b/share/static/css/base/misc.css
@@ -127,3 +127,24 @@ td.current-recipients {
vertical-align: top;
padding-left: 50px;
}
+
+.inline-row {
+ margin-bottom: 10px;
+ display: inline-flex;
+ width: 100%;
+}
+
+div.inline-row div {
+ width: 175px;
+ display: block;
+}
+
+div.inline-row a {
+ text-align: center;
+ width: 85%;
+}
+
+div.inline-row i {
+ text-align: left;
+ width: 85%;
+}
diff --git a/share/static/js/cascaded.js b/share/static/js/cascaded.js
index 9f625867be..3ece97b8fa 100644
--- a/share/static/js/cascaded.js
+++ b/share/static/js/cascaded.js
@@ -33,6 +33,9 @@ function filter_cascade_by_id (id, vals) {
}
function filter_cascade_select (select, complete_select, vals) {
+ console.log(select);
+ console.log(complete_select);
+ console.log(vals);
if ( !( vals instanceof Array ) ) {
vals = [vals];
}
diff --git a/share/static/js/event-registration.js b/share/static/js/event-registration.js
index eaacbdb570..2de4c15811 100644
--- a/share/static/js/event-registration.js
+++ b/share/static/js/event-registration.js
@@ -45,6 +45,8 @@ jQuery(ReplaceUserReferences);
jQuery(function() {
jQuery("select.cascade-by-optgroup").each(function(){
var name = this.name;
+ console.log('here');
+ console.log(name);
if (!name) return;
// Generate elements for cascading based on the master <select> ...
-----------------------------------------------------------------------
More information about the rt-commit
mailing list