sunnavy at bestpractical
Nov 3, 2009, 9:19 PM
Post #1 of 1
(77 views)
Permalink
|
|
rt branch, 3.8-trunk, updated. rt-3.8.6-71-g55f5e82
|
|
The branch, 3.8-trunk has been updated
via 55f5e824dcb06e344a8ae7535f14c973639a0bea (commit)
from 8cac533616e5e9fda3349207f8b08343d21837d8 (commit)
Summary of changes:
share/html/Search/Elements/EditSearches | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
- Log -----------------------------------------------------------------
commit 55f5e824dcb06e344a8ae7535f14c973639a0bea
Author: sunnavy <sunnavy[at]bestpractical.com>
Date: Wed Nov 4 13:18:35 2009 +0800
check $container to see if $ARGS{\'SavedSearchLoad\'} can be loaded
diff --git a/share/html/Search/Elements/EditSearches b/share/html/Search/Elements/EditSearches
index 2122fb9..62871fd 100644
--- a/share/html/Search/Elements/EditSearches
+++ b/share/html/Search/Elements/EditSearches
@@ -156,17 +156,23 @@ if ( $ARGS{'SavedSearchRevert'} ) {
if ( $ARGS{'SavedSearchLoad'} ) {
my ($container, $id ) = _parse_saved_search ($ARGS{'SavedSearchLoad'});
- my $search = $container->Attributes->WithId( $id );
-
- $SavedSearch->{'Id'} = $ARGS{'SavedSearchLoad'};
- $SavedSearch->{'Object'} = $search;
- $SavedSearch->{'Description'} = $search->Description;
- $Query->{$_} = $search->SubValue($_) foreach @SearchFields;
-
- if ( $ARGS{'SavedSearchRevert'} ) {
- push @results, loc('Loaded original "[_1]" saved search', $SavedSearch->{'Description'} );
- } else {
- push @results, loc('Loaded saved search "[_1]"', $SavedSearch->{'Description'} );
+ if ( $container ) {
+ my $search = $container->Attributes->WithId( $id );
+ $SavedSearch->{'Id'} = $ARGS{'SavedSearchLoad'};
+ $SavedSearch->{'Object'} = $search;
+ $SavedSearch->{'Description'} = $search->Description;
+ $Query->{$_} = $search->SubValue($_) foreach @SearchFields;
+
+ if ( $ARGS{'SavedSearchRevert'} ) {
+ push @results, loc('Loaded original "[_1]" saved search', $SavedSearch->{'Description'} );
+ } else {
+ push @results, loc('Loaded saved search "[_1]"', $SavedSearch->{'Description'} );
+ }
+ }
+ else {
+ push @results, loc( 'Can not load saved search "[_1]"',
+ $ARGS{'SavedSearchLoad'} );
+ return @results;
}
}
elsif ( $ARGS{'SavedSearchDelete'} ) {
-----------------------------------------------------------------------
_______________________________________________
Rt-commit mailing list
Rt-commit[at]lists.bestpractical.com
http://lists.bestpractical.com/cgi-bin/mailman/listinfo/rt-commit
|
