X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FSearch%2FElements%2FEditSearches;h=372a20fb8281d615d2fe87be076beefaade79938;hb=679854b8bbc65d112071111bbd7f34a6a481fb30;hp=62871fd5f5b00311df99fe06b618fed55bc0b13f;hpb=b4b0c7e72d7eaee2fbfc7022022c9698323203dd;p=freeside.git diff --git a/rt/share/html/Search/Elements/EditSearches b/rt/share/html/Search/Elements/EditSearches index 62871fd5f..372a20fb8 100644 --- a/rt/share/html/Search/Elements/EditSearches +++ b/rt/share/html/Search/Elements/EditSearches @@ -1,40 +1,40 @@ %# BEGIN BPS TAGGED BLOCK {{{ -%# +%# %# COPYRIGHT: -%# -%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC -%# -%# +%# +%# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC +%# +%# %# (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 @@ -43,16 +43,17 @@ %# 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 }}} +
<&| /Widgets/TitleBox, title => loc($Title)&> %# Hide all the save functionality if the user shouldn't see it. % if ( $can_modify ) { -<&|/l&>Privacy: +<&|/l&>Privacy: <& SelectSearchObject, Name => 'SavedSearchOwner', Objects => \@Objects, Object => ( $Object && $Object->id ) ? $Object->Object : '' &>
-<&|/l&>Description: +<&|/l&>Description: % if ($Id ne 'new') { @@ -67,19 +68,19 @@ % } % if ( $Object && $Object->Id ) { - + % } else { - + %} % }
-<&|/l&>Load saved search: +<&|/l&>Load saved search: <& SelectSearchesForObjects, Name => 'SavedSearchLoad', Objects => \@Objects, SearchType => $Type &> - + - +
<%INIT> return unless $session{'CurrentUser'}->HasRight( Right => 'LoadSavedSearch', @@ -91,8 +92,8 @@ my $can_modify = $session{'CurrentUser'}->HasRight( Object => $RT::System, ); -use RT::SavedSearches; -my @Objects = RT::SavedSearches->new($session{CurrentUser})->_PrivacyObjects; +use RT::SavedSearch; +my @Objects = RT::SavedSearch->new($session{CurrentUser})->_PrivacyObjects; push @Objects, RT::System->new( $session{'CurrentUser'} ) if $session{'CurrentUser'}->HasRight( Object=> $RT::System, Right => 'SuperUser' ); @@ -180,7 +181,11 @@ elsif ( $ARGS{'SavedSearchDelete'} ) { my ($container, $id) = _parse_saved_search( $SavedSearch->{'Id'} ); if ( $container && $container->id ) { # We have the object the entry is an attribute on; delete the entry... - $container->Attributes->DeleteEntry( Name => 'SavedSearch', id => $id ); + my ($val, $msg) = $container->Attributes->DeleteEntry( Name => 'SavedSearch', id => $id ); + unless ( $val ) { + push @results, $msg; + return @results; + } } $SavedSearch->{'Id'} = 'new'; $SavedSearch->{'Object'} = undef; @@ -250,13 +255,35 @@ if ( $obj && $obj->id ) { if ( $new_obj_type && $new_obj_id ) { my ($val, $msg); - if ( $new_obj_type ne $obj_type ) { - ($val, $msg ) = $obj->SetObjectType($new_obj_type); - push @results, loc ('Unable to set privacy object: [_1]', $msg) unless ( $val ); + + # we need to check right before we change any of ObjectType and ObjectId, + # or it will fail the 2nd change if we use SetObjectType and + # SetObjectId sequentially + + if ( $obj->CurrentUserHasRight('update') ) { + if ( $new_obj_type ne $obj_type ) { + ( $val, $msg ) = $obj->__Set( + Field => 'ObjectType', + Value => $new_obj_type, + ); + push @results, loc( 'Unable to set privacy object: [_1]', $msg ) + unless ($val); + } + if ( $new_obj_id != $obj_id ) { + ( $val, $msg ) = $obj->__Set( + Field => 'ObjectId', + Value => $new_obj_id, + ); + push @results, loc( 'Unable to set privacy id: [_1]', $msg ) + unless ($val); + } } - if ( $new_obj_id != $obj_id ) { - ($val, $msg) = $obj->SetObjectId($new_obj_id); - push @results, loc ('Unable to set privacy id: [_1]', $msg) unless ( $val ); + else { + # two loc are just for convenience so we don't need to + # write an extra i18n translation item + push @results, + loc( 'Unable to set privacy object or id: [_1]', + loc('Permission Denied') ) } } else { push @results, loc('Unable to determine object type or id');