[Rt-commit] rt branch, master, created. rt-3.9.7-1046-g567ef34
Alex Vandiver
alexmv at bestpractical.com
Tue Dec 28 13:27:45 EST 2010
The branch, master has been created
at 567ef345957763a27979a67df7c357a31194881a (commit)
- Log -----------------------------------------------------------------
commit 95eba72f5efe98a9b9fbb68d60a0b00e58a53569
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Wed Dec 15 23:17:54 2010 -0500
Begin renaming summary to sidebar
diff --git a/share/html/Admin/Global/MyRT.html b/share/html/Admin/Global/MyRT.html
index 2f67984..9601d72 100644
--- a/share/html/Admin/Global/MyRT.html
+++ b/share/html/Admin/Global/MyRT.html
@@ -86,7 +86,7 @@ my @panes = $m->comp(
'/Admin/Elements/ConfigureMyRT',
panes => [
'body', #loc
- 'summary', #loc
+ 'sidebar', #loc
],
Action => 'MyRT.html',
items => \@items,
diff --git a/share/html/Elements/MyRT b/share/html/Elements/MyRT
index 1fa4443..e03c077 100644
--- a/share/html/Elements/MyRT
+++ b/share/html/Elements/MyRT
@@ -53,9 +53,9 @@
% $show_cb->($_) foreach @$body;
</td>
-% if ( $summary ) {
+% if ( $sidebar ) {
<td class="boxcontainer">
-% $show_cb->($_) foreach @$summary;
+% $show_cb->($_) foreach @$sidebar;
</td>
% }
@@ -75,12 +75,12 @@ unless ( $Portlets ) {
);
}
-my ($body, $summary) = @{$Portlets}{qw(body summary)};
+my ($body, $sidebar) = @{$Portlets}{qw(body sidebar)};
unless( $body && @$body ) {
- $body = $summary || [];
- $summary = undef;
+ $body = $sidebar || [];
+ $sidebar = undef;
}
-$summary = undef unless $summary && @$summary;
+$sidebar = undef unless $sidebar && @$sidebar;
my $Rows = $user->Preferences( 'SummaryRows', ( RT->Config->Get('DefaultSummaryRows') || 10 ) );
diff --git a/share/html/Prefs/MyRT.html b/share/html/Prefs/MyRT.html
index 42bc1ea..b0a4d14 100644
--- a/share/html/Prefs/MyRT.html
+++ b/share/html/Prefs/MyRT.html
@@ -148,7 +148,7 @@ for my $object (@objs) {
my @panes = $m->comp(
'/Admin/Elements/ConfigureMyRT',
- panes => ['body', 'summary'],
+ panes => ['body', 'sidebar'],
Action => 'MyRT.html',
items => \@items,
current_portlets => $portlets,
commit c35ae7729a7b82c6d9345a3662398c990524f70f
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Wed Dec 15 23:23:28 2010 -0500
Rename summary to sidebar in initialdata
diff --git a/etc/initialdata b/etc/initialdata
index 82e0fb0..803f95e 100755
--- a/etc/initialdata
+++ b/etc/initialdata
@@ -591,7 +591,7 @@ Hour: { $SubscriptionObj->SubValue('Hour') }
{ type => 'system', name => 'Bookmarked Tickets' },
{ type => 'component', name => 'QuickCreate' },
],
- 'summary' => # loc
+ 'sidebar' => # loc
[
{ type => 'component', name => 'MyReminders' },
{ type => 'component', name => 'Quicksearch' },
commit 307a4783273b75bbe3d355a423a90be8bb1788ab
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Wed Dec 15 23:23:45 2010 -0500
Fix sidebar in admin UI for other users
diff --git a/share/html/Admin/Users/MyRT.html b/share/html/Admin/Users/MyRT.html
index b0d065a..adbb12a 100644
--- a/share/html/Admin/Users/MyRT.html
+++ b/share/html/Admin/Users/MyRT.html
@@ -108,7 +108,7 @@ for my $object (@objs) {
my @panes = $m->comp(
'/Admin/Elements/ConfigureMyRT',
- panes => ['body', 'summary'],
+ panes => ['body', 'sidebar'],
Action => "MyRT.html?id=$id",
items => \@items,
current_portlets => $portlets,
commit 065e3ed479cfa0a4ab118b8f2fea0dafd12bff28
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Wed Dec 15 23:47:25 2010 -0500
Upgrade script for user prefs
diff --git a/etc/upgrade/3.9.9/content b/etc/upgrade/3.9.9/content
new file mode 100644
index 0000000..273bf95
--- /dev/null
+++ b/etc/upgrade/3.9.9/content
@@ -0,0 +1,15 @@
+ at Initial = (
+ sub {
+ my $users = RT::Users->new(RT->SystemUser);
+ $users->UnLimit;
+
+ while (my $user = $users->Next) {
+ my $settings = $user->Preferences('HomepageSettings')
+ or next;
+ $settings->{sidebar} = delete $settings->{summary};
+ $user->SetPreferences('HomepageSettings', $settings);
+ }
+ },
+);
+
+
commit 2f910d41f64929921e4d876f3fa7d04ad43eadb3
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Wed Dec 15 23:50:29 2010 -0500
Skip updating user prefs when there's a sidebar already
diff --git a/etc/upgrade/3.9.9/content b/etc/upgrade/3.9.9/content
index 273bf95..03bc20e 100644
--- a/etc/upgrade/3.9.9/content
+++ b/etc/upgrade/3.9.9/content
@@ -6,6 +6,8 @@
while (my $user = $users->Next) {
my $settings = $user->Preferences('HomepageSettings')
or next;
+ next if exists $settings->{sidebar};
+
$settings->{sidebar} = delete $settings->{summary};
$user->SetPreferences('HomepageSettings', $settings);
}
commit 209b817a7d5d26a3c471f8033762f0f409ab9a04
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Wed Dec 15 23:53:58 2010 -0500
Upgrade the default HomepageSettings too
diff --git a/etc/upgrade/3.9.9/content b/etc/upgrade/3.9.9/content
index 03bc20e..80783eb 100644
--- a/etc/upgrade/3.9.9/content
+++ b/etc/upgrade/3.9.9/content
@@ -12,6 +12,14 @@
$user->SetPreferences('HomepageSettings', $settings);
}
},
+ sub {
+ my ($default_portlets) = RT->System->Attributes->Named('HomepageSettings');
+ my $settings = $default_portlets->Content;
+ return if exists $settings->{sidebar};
+
+ $settings->{sidebar} = delete $settings->{summary};
+ $default_portlets->SetContent($settings);
+ },
);
commit d026b7ea5843c64f6f910e028b332da4511771b2
Merge: 4fa7ba8 209b817
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Thu Dec 23 17:54:41 2010 -0500
Merge branch 'rt-at-a-glance-renames' into 4.1-trunk
commit cb6a7f7c7033045b0c3f5d6f62bb96688fabdb3c
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Thu Dec 23 17:56:12 2010 -0500
Bump the version on the rt-at-a-glance-renames upgrade dir
diff --git a/etc/upgrade/3.9.9/content b/etc/upgrade/4.1.0/content
similarity index 100%
rename from etc/upgrade/3.9.9/content
rename to etc/upgrade/4.1.0/content
commit 8edb6e50aafc1f8a1c6bee500bc1be57ed5cd8ac
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Thu Dec 23 18:44:11 2010 -0500
Case fix
diff --git a/share/html/Elements/ShowSearch b/share/html/Elements/ShowSearch
index c681654..8ef38ac 100644
--- a/share/html/Elements/ShowSearch
+++ b/share/html/Elements/ShowSearch
@@ -69,7 +69,7 @@ if ($SavedSearch) {
}
$search = $container_object->Attributes->WithId($search_id);
unless ( $search->Id && ref( $SearchArg = $search->Content ) eq 'HASH' ) {
- $m->out(loc("Saved Search [_1] not found", $SavedSearch)) unless $IgnoreMissing;
+ $m->out(loc("Saved search [_1] not found", $SavedSearch)) unless $IgnoreMissing;
return;
}
$SearchArg->{'SavedSearchId'} ||= $SavedSearch;
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");
commit 567ef345957763a27979a67df7c357a31194881a
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Mon Dec 27 18:59:30 2010 -0500
Implement goto_create_ticket('General')
diff --git a/lib/RT/Test/Web.pm b/lib/RT/Test/Web.pm
index efffc4c..34f50e8 100644
--- a/lib/RT/Test/Web.pm
+++ b/lib/RT/Test/Web.pm
@@ -168,7 +168,10 @@ sub goto_create_ticket {
} elsif ( $queue =~ /^\d+$/ ) {
$id = $queue;
} else {
- die "not yet implemented";
+ my $queue_obj = RT::Queue->new(RT->SystemUser);
+ my ($ok, $msg) = $queue_obj->Load($queue);
+ die "Unable to load queue '$queue': $msg" if !$ok;
+ $id = $queue_obj->id;
}
$self->get($self->rt_base_url . 'Ticket/Create.html?Queue='.$id);
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list