diff options
Diffstat (limited to 'rt/share')
| -rw-r--r-- | rt/share/html/Admin/Elements/EditRights | 3 | ||||
| -rw-r--r-- | rt/share/html/Admin/Tools/Theme.html | 2 | ||||
| -rw-r--r-- | rt/share/html/Elements/ValidateCustomFields | 27 | ||||
| -rwxr-xr-x | rt/share/html/Search/Bulk.html | 26 | ||||
| -rwxr-xr-x | rt/share/html/index.html | 2 |
5 files changed, 19 insertions, 41 deletions
diff --git a/rt/share/html/Admin/Elements/EditRights b/rt/share/html/Admin/Elements/EditRights index 5d1e62f40..20ee551c9 100644 --- a/rt/share/html/Admin/Elements/EditRights +++ b/rt/share/html/Admin/Elements/EditRights @@ -96,6 +96,9 @@ if ($anchor =~ /AddPrincipal/) { jQuery(".rights-editor").tabs({ select: function(ev, ui) { sync_anchor(ui.tab.hash); + if ( jQuery(ui.tab).find('input[type=text]').size() > 0 ) { + jQuery(ui.tab).find('input[type=text]:first').focus(); + } } }); diff --git a/rt/share/html/Admin/Tools/Theme.html b/rt/share/html/Admin/Tools/Theme.html index ac297e9ee..123fae252 100644 --- a/rt/share/html/Admin/Tools/Theme.html +++ b/rt/share/html/Admin/Tools/Theme.html @@ -309,7 +309,7 @@ sub analyze_img { my @top5 = grep { defined and $_->{'l'} and $_->{'c'} } (sort { $b->{rank} <=> $a->{rank} } values %$color)[0..5]; if ((scalar uniq map {$_->{rank}} @top5) == 1) { - warn "bad"; + $RT::Logger->info("Only one color found in logo image"); } return \@top5; } diff --git a/rt/share/html/Elements/ValidateCustomFields b/rt/share/html/Elements/ValidateCustomFields index 713885f6f..8b4982842 100644 --- a/rt/share/html/Elements/ValidateCustomFields +++ b/rt/share/html/Elements/ValidateCustomFields @@ -83,27 +83,12 @@ while ( my $CF = $CustomFields->Next ) { for my $value( @values ) { if ($value) { - if ( $CF->Type eq 'IPAddress' ) { - use Regexp::Common qw(RE_net_IPv4); - my $ip = RT::ObjectCustomFieldValue->ParseIP( $value ); - unless ( $ip ) { - my $msg = - loc( "Input can not be parsed as an IP address" ); - $m->notes( ( 'InvalidField-' . $CF->Id ) => $msg ); - push @res, $msg; - $valid = 0; - } - } - elsif ( $CF->Type eq 'IPAddressRange' ) { - my ( $start_ip, $end_ip ) = - RT::ObjectCustomFieldValue->ParseIPRange($value); - unless ( $start_ip && $end_ip ) { - my $msg = - loc( "Input can not be parsed as an IP address range" ); - $m->notes( ( 'InvalidField-' . $CF->Id ) => $msg ); - push @res, $msg; - $valid = 0; - } + my $ref = { Content => $value }; + my ($ok, $msg) = $CF->_CanonicalizeValue( $ref ); + unless ($ok) { + $m->notes( ( 'InvalidField-' . $CF->Id ) => $msg ); + push @res, $msg; + $valid = 0; } } diff --git a/rt/share/html/Search/Bulk.html b/rt/share/html/Search/Bulk.html index 38ca64248..8c5d642d2 100755 --- a/rt/share/html/Search/Bulk.html +++ b/rt/share/html/Search/Bulk.html @@ -388,24 +388,14 @@ unless ( $ARGS{'AddMoreAttach'} ) { foreach my $value (@values) { - # Convert for timezone. Without converstion, - # HasEntry and DeleteCustomFieldValue fail because - # the value in the DB is converted. - if ( $op eq 'del' - && ($cf->Type eq 'DateTime' || $cf->Type eq 'Date') ){ - my $DateObj = RT::Date->new( $session{'CurrentUser'} ); - $DateObj->Set( Format => 'unknown', - Value => $value ); - $value = $cf->Type eq 'DateTime' ? $DateObj->ISO - : $DateObj->ISO(Time => 0, Seconds => 0); - } - - if ( $op eq 'del' && $current_values->HasEntry($value) ) { - my ( $id, $msg ) = $Ticket->DeleteCustomFieldValue( - Field => $cfid, - Value => $value - ); - push @cfresults, $msg; + if ( $op eq 'del' ) { + if ( my $entry = $current_values->HasEntry($value) ) { + my ( $id, $msg ) = $Ticket->DeleteCustomFieldValue( + Field => $cfid, + ValueId => $entry->id, + ); + push @cfresults, $msg; + } } elsif ( $op eq 'add' && !$current_values->HasEntry($value) ) { diff --git a/rt/share/html/index.html b/rt/share/html/index.html index 702c75bed..4103dbdca 100755 --- a/rt/share/html/index.html +++ b/rt/share/html/index.html @@ -106,7 +106,7 @@ if ( $ARGS{'QuickCreate'} ) { my ($t, $msg) = CreateTicket( Queue => $ARGS{'Queue'}, Owner => $ARGS{'Owner'}, - Status => $ARGS{'Status'}||'new', + Status => $ARGS{'Status'}, # yes! it's Requestors, not Requestor Requestors => $ARGS{'Requestors'}, From => $session{'CurrentUser'}->EmailAddress, |