[Rt-commit] rt branch, 4.1-trunk, updated. rt-3.9.7-1045-g10da96c
Shawn Moore
sartak at bestpractical.com
Thu Dec 23 19:11:27 EST 2010
The branch, 4.1-trunk has been updated
via 10da96cf2094a7164368fa7684b13c537e59dc75 (commit)
via b6f5c0af97082bdd9d3d3c95262aae0aae0f654b (commit)
from 8edb6e50aafc1f8a1c6bee500bc1be57ed5cd8ac (commit)
Summary of changes:
lib/RT/CustomField_Overlay.pm | 2 +-
lib/RT/Principal_Overlay.pm | 2 +-
lib/RT/SharedSetting.pm | 8 ++++----
lib/RT/Topic_Overlay.pm | 2 +-
share/html/Admin/Global/MyRT.html | 2 +-
share/html/Dashboards/Modify.html | 2 +-
share/html/Dashboards/Subscription.html | 4 ++--
t/web/dashboards-basics.t | 24 ++++++++++++------------
t/web/dashboards-groups.t | 4 ++--
9 files changed, 25 insertions(+), 25 deletions(-)
- Log -----------------------------------------------------------------
commit b6f5c0af97082bdd9d3d3c95262aae0aae0f654b
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Thu Dec 23 18:49:33 2010 -0500
Remove punctuation to combine loc strings
diff --git a/share/html/Dashboards/Subscription.html b/share/html/Dashboards/Subscription.html
index 3d5c606..086192f 100644
--- a/share/html/Dashboards/Subscription.html
+++ b/share/html/Dashboards/Subscription.html
@@ -196,7 +196,7 @@ my $timezone = $session{'CurrentUser'}->UserObj->Timezone || RT->Config->Get('Ti
use RT::Dashboard;
my $DashboardObj = RT::Dashboard->new($session{'CurrentUser'});
($val, $msg) = $DashboardObj->LoadById($id);
-$val || Abort(loc("Couldn't load dashboard [_1]: [_2].", $id, $msg));
+$val || Abort(loc("Couldn't load dashboard [_1]: [_2]", $id, $msg));
my $SubscriptionObj = $DashboardObj->Subscription;
commit 10da96cf2094a7164368fa7684b13c537e59dc75
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Thu Dec 23 19:01:45 2010 -0500
Permission Denied is the canonical casing
diff --git a/lib/RT/CustomField_Overlay.pm b/lib/RT/CustomField_Overlay.pm
index 4458836..a986f36 100755
--- a/lib/RT/CustomField_Overlay.pm
+++ b/lib/RT/CustomField_Overlay.pm
@@ -1672,7 +1672,7 @@ sub SetBasedOn {
my $cf = RT::CustomField->new( $self->CurrentUser );
$cf->Load( ref $value ? $value->id : $value );
- return (0, "Permission denied")
+ return (0, "Permission Denied")
unless $cf->id && $cf->CurrentUserHasRight('SeeCustomField');
# XXX: Remove this restriction once we support lists and cascaded selects
diff --git a/lib/RT/Principal_Overlay.pm b/lib/RT/Principal_Overlay.pm
index b216c14..314be27 100755
--- a/lib/RT/Principal_Overlay.pm
+++ b/lib/RT/Principal_Overlay.pm
@@ -150,7 +150,7 @@ sub GrantRight {
@_
);
- return (0, "Permission denied") if $args{'Right'} eq 'ExecuteCode'
+ return (0, "Permission Denied") if $args{'Right'} eq 'ExecuteCode'
and RT->Config->Get('DisallowExecuteCode');
#ACL check handled in ACE.pm
diff --git a/lib/RT/SharedSetting.pm b/lib/RT/SharedSetting.pm
index 0faf31f..18288a4 100644
--- a/lib/RT/SharedSetting.pm
+++ b/lib/RT/SharedSetting.pm
@@ -108,7 +108,7 @@ sub Load {
$self->{'Privacy'} = $privacy;
$self->PostLoad();
- return (0, $self->loc("Permission denied"))
+ return (0, $self->loc("Permission Denied"))
unless $self->CurrentUserCanSee;
return (1, $self->loc("Loaded [_1] [_2]", $self->ObjectName, $self->Name));
@@ -185,7 +185,7 @@ sub Save {
return (0, $self->loc("Failed to load object for [_1]", $privacy))
unless $object;
- return (0, $self->loc("Permission denied"))
+ return (0, $self->loc("Permission Denied"))
unless $self->CurrentUserCanCreate($privacy);
my ($att_id, $att_msg) = $self->SaveAttribute($object, \%args);
@@ -226,7 +226,7 @@ sub Update {
return(0, $self->loc("Could not load [_1] attribute", $self->ObjectName))
unless $self->{'Attribute'}->Id;
- return (0, $self->loc("Permission denied"))
+ return (0, $self->loc("Permission Denied"))
unless $self->CurrentUserCanModify;
my ($status, $msg) = $self->UpdateAttribute(\%args);
@@ -258,7 +258,7 @@ where status is true upon success.
sub Delete {
my $self = shift;
- return (0, $self->loc("Permission denied"))
+ return (0, $self->loc("Permission Denied"))
unless $self->CurrentUserCanDelete;
my ($status, $msg) = $self->{'Attribute'}->Delete;
diff --git a/lib/RT/Topic_Overlay.pm b/lib/RT/Topic_Overlay.pm
index 0c87b4d..67d422a 100644
--- a/lib/RT/Topic_Overlay.pm
+++ b/lib/RT/Topic_Overlay.pm
@@ -81,7 +81,7 @@ sub Create {
$obj = $RT::System unless $obj->id;
}
- return ( 0, $self->loc("Permission denied"))
+ return ( 0, $self->loc("Permission Denied"))
unless ( $self->CurrentUser->HasRight(
Right => "AdminTopics",
Object => $obj,
diff --git a/share/html/Admin/Global/MyRT.html b/share/html/Admin/Global/MyRT.html
index 9601d72..4e4d3c4 100644
--- a/share/html/Admin/Global/MyRT.html
+++ b/share/html/Admin/Global/MyRT.html
@@ -95,7 +95,7 @@ my @panes = $m->comp(
OnSave => sub {
my ( $conf, $pane ) = @_;
if (!$has_right) {
- push @actions, loc( 'Permission denied' );
+ push @actions, loc( 'Permission Denied' );
}
else {
$default_portlets->SetContent( $conf );
diff --git a/share/html/Dashboards/Modify.html b/share/html/Dashboards/Modify.html
index 1a21a42..3aee282 100644
--- a/share/html/Dashboards/Modify.html
+++ b/share/html/Dashboards/Modify.html
@@ -92,7 +92,7 @@ my $Dashboard = RT::Dashboard->new($session{'CurrentUser'});
my $method = $Create ? 'ObjectsForCreating' : 'ObjectsForModifying';
my @privacies = $Dashboard->$method;
-Abort(loc("Permission denied")) if @privacies == 0;
+Abort(loc("Permission Denied")) if @privacies == 0;
if ($Create) {
$title = loc("Create a new dashboard");
diff --git a/share/html/Dashboards/Subscription.html b/share/html/Dashboards/Subscription.html
index 086192f..b43bcec 100644
--- a/share/html/Dashboards/Subscription.html
+++ b/share/html/Dashboards/Subscription.html
@@ -244,7 +244,7 @@ if (defined $ARGS{Save}) {
}
# create
else {
- Abort(loc("Unable to subscribe to dashboard [_1]: Permission denied", $id))
+ Abort(loc("Unable to subscribe to dashboard [_1]: Permission Denied", $id))
unless $DashboardObj->CurrentUserCanSubscribe;
$SubscriptionObj = RT::Attribute->new($session{CurrentUser});
diff --git a/t/web/dashboards-basics.t b/t/web/dashboards-basics.t
index 3e29463..ed98362 100644
--- a/t/web/dashboards-basics.t
+++ b/t/web/dashboards-basics.t
@@ -41,24 +41,24 @@ $m->content_lacks('<a href="/Dashboards/Modify.html?Create=1">New</a>',
$m->no_warnings_ok;
$m->get_ok($url."Dashboards/Modify.html?Create=1");
-$m->content_contains("Permission denied");
+$m->content_contains("Permission Denied");
$m->content_lacks("Save Changes");
-$m->warning_like(qr/Permission denied/, "got a permission denied warning");
+$m->warning_like(qr/Permission Denied/, "got a permission denied warning");
$user_obj->PrincipalObj->GrantRight(Right => 'ModifyOwnDashboard', Object => $RT::System);
# Modify itself is no longer good enough, you need Create
$m->get_ok($url."Dashboards/Modify.html?Create=1");
-$m->content_contains("Permission denied");
+$m->content_contains("Permission Denied");
$m->content_lacks("Save Changes");
-$m->warning_like(qr/Permission denied/, "got a permission denied warning");
+$m->warning_like(qr/Permission Denied/, "got a permission denied warning");
$user_obj->PrincipalObj->GrantRight(Right => 'CreateOwnDashboard', Object => $RT::System);
$m->get_ok($url."Dashboards/Modify.html?Create=1");
-$m->content_lacks("Permission denied");
+$m->content_lacks("Permission Denied");
$m->content_contains("Create");
$m->get_ok($url."Dashboards/index.html");
@@ -72,12 +72,12 @@ $m->content_contains("Saved dashboard different dashboard");
$user_obj->PrincipalObj->GrantRight(Right => 'SeeOwnDashboard', Object => $RT::System);
$m->get($url."Dashboards/index.html");
$m->follow_link_ok({ text => 'different dashboard'});
-$m->content_lacks("Permission denied", "we now have SeeOwnDashboard");
+$m->content_lacks("Permission Denied", "we now have SeeOwnDashboard");
$m->content_lacks('Delete', "Delete button hidden because we lack DeleteOwnDashboard");
$m->get_ok($url."Dashboards/index.html");
$m->content_contains("different dashboard", "we now have SeeOwnDashboard");
-$m->content_lacks("Permission denied");
+$m->content_lacks("Permission Denied");
$m->follow_link_ok({text => "different dashboard"});
$m->content_contains("Basics");
@@ -155,8 +155,8 @@ $m->content_contains("dashboard test", "ticket subject");
$m->get_ok("/Dashboards/Subscription.html?id=$id");
$m->form_name('SubscribeDashboard');
$m->click_button(name => 'Save');
-$m->content_contains("Permission denied");
-$m->warning_like(qr/Unable to subscribe to dashboard.*Permission denied/, "got a permission denied warning when trying to subscribe to a dashboard");
+$m->content_contains("Permission Denied");
+$m->warning_like(qr/Unable to subscribe to dashboard.*Permission Denied/, "got a permission denied warning when trying to subscribe to a dashboard");
$user_obj->Attributes->RedoSearch;
is($user_obj->Attributes->Named('Subscription'), 0, "no subscriptions");
@@ -173,7 +173,7 @@ $m->content_unlike( qr/Bookmarked Tickets.*Bookmarked Tickets/s,
$m->form_name('SubscribeDashboard');
$m->click_button(name => 'Save');
-$m->content_lacks("Permission denied");
+$m->content_lacks("Permission Denied");
$m->content_contains("Subscribed to dashboard different dashboard");
$user_obj->Attributes->RedoSearch;
@@ -184,9 +184,9 @@ $m->follow_link_ok({text => "Subscription"});
$m->content_contains("Modify the subscription to dashboard different dashboard");
$m->get_ok("/Dashboards/Modify.html?id=$id&Delete=1");
-$m->content_contains("Permission denied", "unable to delete dashboard because we lack DeleteOwnDashboard");
+$m->content_contains("Permission Denied", "unable to delete dashboard because we lack DeleteOwnDashboard");
-$m->warning_like(qr/Couldn't delete dashboard.*Permission denied/, "got a permission denied warning when trying to delete the dashboard");
+$m->warning_like(qr/Couldn't delete dashboard.*Permission Denied/, "got a permission denied warning when trying to delete the dashboard");
$user_obj->PrincipalObj->GrantRight(Right => 'DeleteOwnDashboard', Object => $RT::System);
diff --git a/t/web/dashboards-groups.t b/t/web/dashboards-groups.t
index f424d68..d37c4ec 100644
--- a/t/web/dashboards-groups.t
+++ b/t/web/dashboards-groups.t
@@ -76,7 +76,7 @@ $user_obj->PrincipalObj->GrantRight(
Object => $inner_group,
);
$m->reload;
-$m->content_lacks("Permission denied", "we now have SeeGroupDashboard");
+$m->content_lacks("Permission Denied", "we now have SeeGroupDashboard");
$m->content_contains("Saved dashboard inner dashboard");
$m->content_lacks('Delete', "Delete button hidden because we lack DeleteDashboard");
@@ -92,6 +92,6 @@ is($dashboard->PossibleHiddenSearches, 0, "all searches are visible");
$m->get_ok("/Dashboards/Modify.html?id=$id");
$m->content_contains("inner dashboard", "we now have SeeGroupDashboard right");
-$m->content_lacks("Permission denied");
+$m->content_lacks("Permission Denied");
$m->content_contains('Subscription', "Subscription link not hidden because we have SubscribeDashboard");
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list