[Rt-commit] r12083 - in rt/branches/3.8-TESTING: . html/Dashboards html/Dashboards/Elements html/User/Elements
sartak at bestpractical.com
sartak at bestpractical.com
Mon May 5 20:00:00 EDT 2008
Author: sartak
Date: Mon May 5 19:59:59 2008
New Revision: 12083
Modified:
rt/branches/3.8-TESTING/ (props changed)
rt/branches/3.8-TESTING/html/Dashboards/Elements/ShowDashboards
rt/branches/3.8-TESTING/html/Dashboards/Elements/ShowSubscription
rt/branches/3.8-TESTING/html/Dashboards/Elements/Tabs
rt/branches/3.8-TESTING/html/Dashboards/Modify.html
rt/branches/3.8-TESTING/html/Dashboards/Queries.html
rt/branches/3.8-TESTING/html/Dashboards/Render.html
rt/branches/3.8-TESTING/html/Dashboards/Subscription.html
rt/branches/3.8-TESTING/html/Dashboards/index.html
rt/branches/3.8-TESTING/html/User/Elements/Tabs
rt/branches/3.8-TESTING/t/web/dashboards.t
Log:
r55068 at onn: sartak | 2008-05-05 19:59:14 -0400
Finish moving /Prefs/Dashboards to /Dashboards
Modified: rt/branches/3.8-TESTING/html/Dashboards/Elements/ShowDashboards
==============================================================================
--- rt/branches/3.8-TESTING/html/Dashboards/Elements/ShowDashboards (original)
+++ rt/branches/3.8-TESTING/html/Dashboards/Elements/ShowDashboards Mon May 5 19:59:59 2008
@@ -59,7 +59,7 @@
% my $i = 0;
% for my $dashboard (sort {$b->Id <=> $a->Id} @$Dashboards) {
-% my $url = sprintf '%s/Prefs/Dashboards/Modify.html?id=%d',
+% my $url = sprintf '%s/Dashboards/Modify.html?id=%d',
% $RT::WebPath,
% $dashboard->Id;
@@ -75,7 +75,7 @@
</a>
</td>
<td class="collection-as-table">
- <& /Prefs/Dashboards/Elements/ShowSubscription, Dashboard => $dashboard, Subscription => $subscription_for{$dashboard->Id} &>
+ <& /Dashboards/Elements/ShowSubscription, Dashboard => $dashboard, Subscription => $subscription_for{$dashboard->Id} &>
</td>
</tr>
% }
Modified: rt/branches/3.8-TESTING/html/Dashboards/Elements/ShowSubscription
==============================================================================
--- rt/branches/3.8-TESTING/html/Dashboards/Elements/ShowSubscription (original)
+++ rt/branches/3.8-TESTING/html/Dashboards/Elements/ShowSubscription Mon May 5 19:59:59 2008
@@ -51,7 +51,7 @@
$Subscription => undef
</%ARGS>
<%INIT>
-my $url = sprintf '%s/Prefs/Dashboards/Subscription.html?DashboardId=%d',
+my $url = sprintf '%s/Dashboards/Subscription.html?DashboardId=%d',
$RT::WebPath,
$Dashboard->Id,;
Modified: rt/branches/3.8-TESTING/html/Dashboards/Elements/Tabs
==============================================================================
--- rt/branches/3.8-TESTING/html/Dashboards/Elements/Tabs (original)
+++ rt/branches/3.8-TESTING/html/Dashboards/Elements/Tabs Mon May 5 19:59:59 2008
@@ -47,7 +47,7 @@
%# END BPS TAGGED BLOCK }}}
<& /User/Elements/Tabs,
subtabs => $tabs,
- current_tab => 'Prefs/Dashboards/index.html',
+ current_tab => 'Dashboards/index.html',
current_subtab => $current_subtab,
Title => $Title &>
@@ -57,9 +57,9 @@
if ( $DashboardObj and $DashboardObj->Id ) {
my $idpriv = sprintf 'id=%d',
$DashboardObj->Id;
- my $modify = "Prefs/Dashboards/Modify.html?$idpriv";
- my $queries = "Prefs/Dashboards/Queries.html?$idpriv";
- my $render = "Prefs/Dashboards/Render.html?$idpriv";
+ my $modify = "Dashboards/Modify.html?$idpriv";
+ my $queries = "Dashboards/Queries.html?$idpriv";
+ my $render = "Dashboards/Render.html?$idpriv";
$tabs->{"this"} = {
title => $DashboardObj->Name,
@@ -75,7 +75,7 @@
},
c_Subscription => { title => loc('Subscription'),
- path => "Prefs/Dashboards/Subscription.html?DashboardId=" . $DashboardObj->Id
+ path => "Dashboards/Subscription.html?DashboardId=" . $DashboardObj->Id
},
@@ -92,11 +92,11 @@
}
$tabs->{"A"} = { title => loc('Select dashboard'),
- path => "Prefs/Dashboards/index.html" };
+ path => "Dashboards/index.html" };
if ($session{'CurrentUser'}->HasRight(Right => 'ModifyDashboard', Object => $RT::System)) {
$tabs->{"B"} = { title => loc('New dashboard'),
- path => "Prefs/Dashboards/Modify.html?Create=1",
+ path => "Dashboards/Modify.html?Create=1",
separator => 1 };
}
Modified: rt/branches/3.8-TESTING/html/Dashboards/Modify.html
==============================================================================
--- rt/branches/3.8-TESTING/html/Dashboards/Modify.html (original)
+++ rt/branches/3.8-TESTING/html/Dashboards/Modify.html Mon May 5 19:59:59 2008
@@ -46,14 +46,14 @@
%#
%# END BPS TAGGED BLOCK }}}
<& /Elements/Header, title => $title &>
-<& /Prefs/Dashboards/Elements/Tabs,
+<& /Dashboards/Elements/Tabs,
current_subtab => $current_subtab,
Title => $title,
$Create ? () : (DashboardObj => $Dashboard),
&>
<& /Elements/ListActions, actions => \@results &>
-<form action="<%$RT::WebPath%>/Prefs/Dashboards/Modify.html" method="post" enctype="multipart/form-data" name="ModifyDashboard">
+<form action="<%$RT::WebPath%>/Dashboards/Modify.html" method="post" enctype="multipart/form-data" name="ModifyDashboard">
%unless ($Dashboard->Id) {
<input type="hidden" class="hidden" name="id" value="new" />
@@ -69,7 +69,7 @@
<tr><td align="right">
<&|/l&>Privacy</&>:
</td><td>
-<& /Prefs/Dashboards/Elements/SelectPrivacy, Name => "Privacy", Objects => \@privacies &>
+<& /Dashboards/Elements/SelectPrivacy, Name => "Privacy", Objects => \@privacies &>
</td></tr>
</table>
<& /Elements/Submit, Label => loc('Save Changes') &>
@@ -89,7 +89,7 @@
$Create = 1 if !$id;
if ($Create) {
- $current_subtab = 'Prefs/Dashboards/Modify.html?Create=1';
+ $current_subtab = 'Dashboards/Modify.html?Create=1';
$title = loc("Create a new dashboard");
}
else {
@@ -120,12 +120,12 @@
if ($id) {
$title = loc("Modify the dashboard [_1]", $Dashboard->Name);
- $current_subtab = 'Prefs/Dashboards/Modify.html?id=' . $id;
+ $current_subtab = 'Dashboards/Modify.html?id=' . $id;
}
# If the create failed
else {
$Create = 1;
- $current_subtab = 'Prefs/Dashboards/Modify.html?Create=1';
+ $current_subtab = 'Dashboards/Modify.html?Create=1';
$title = loc("Create a new dashboard");
}
}
Modified: rt/branches/3.8-TESTING/html/Dashboards/Queries.html
==============================================================================
--- rt/branches/3.8-TESTING/html/Dashboards/Queries.html (original)
+++ rt/branches/3.8-TESTING/html/Dashboards/Queries.html Mon May 5 19:59:59 2008
@@ -46,7 +46,7 @@
%#
%# END BPS TAGGED BLOCK }}}
<& /Elements/Header, title => $title &>
-<& /Prefs/Dashboards/Elements/Tabs,
+<& /Dashboards/Elements/Tabs,
current_subtab => $current_subtab,
Title => $title,
DashboardObj => $Dashboard &>
@@ -55,7 +55,7 @@
<& /Elements/ListActions, actions => \@results &>
-<form action="<%$RT::WebPath%>/Prefs/Dashboards/Queries.html" method="post" enctype="multipart/form-data">
+<form action="<%$RT::WebPath%>/Dashboards/Queries.html" method="post" enctype="multipart/form-data">
<input type="hidden" class="hidden" name="id" value="<%$Dashboard->Id%>" />
<input type="hidden" class="hidden" name="Privacy" value="<%$Dashboard->Privacy%>" />
<table width="100%" border="0">
@@ -78,7 +78,7 @@
<%INIT>
-my $current_subtab = 'Prefs/Dashboards/Queries.html?id=' . $id;
+my $current_subtab = 'Dashboards/Queries.html?id=' . $id;
my @results;
use RT::Dashboard;
@@ -125,7 +125,7 @@
# Create a selectionbox widget for those queries
my $sel = $m->comp(
'/Widgets/SelectionBox:new',
- Action => 'Prefs/Dashboards/Queries.html',
+ Action => 'Dashboards/Queries.html',
Name => "Searches",
Available => \@items,
Selected => \@selected,
Modified: rt/branches/3.8-TESTING/html/Dashboards/Render.html
==============================================================================
--- rt/branches/3.8-TESTING/html/Dashboards/Render.html (original)
+++ rt/branches/3.8-TESTING/html/Dashboards/Render.html Mon May 5 19:59:59 2008
@@ -46,7 +46,7 @@
%#
%# END BPS TAGGED BLOCK }}}
<& /Elements/Header, title => $title &>
-<& /Prefs/Dashboards/Elements/Tabs,
+<& /Dashboards/Elements/Tabs,
current_subtab => $current_subtab,
Title => $title,
DashboardObj => $DashboardObj &>
@@ -67,7 +67,7 @@
<%INIT>
-my $current_subtab = 'Prefs/Dashboards/Render.html?id=' $id;
+my $current_subtab = 'Dashboards/Render.html?id=' $id;
use RT::Dashboard;
my $DashboardObj = RT::Dashboard->new($session{'CurrentUser'});
Modified: rt/branches/3.8-TESTING/html/Dashboards/Subscription.html
==============================================================================
--- rt/branches/3.8-TESTING/html/Dashboards/Subscription.html (original)
+++ rt/branches/3.8-TESTING/html/Dashboards/Subscription.html Mon May 5 19:59:59 2008
@@ -46,14 +46,14 @@
%#
%# END BPS TAGGED BLOCK }}}
<& /Elements/Header, title => $title &>
-<& /Prefs/Dashboards/Elements/Tabs,
+<& /Dashboards/Elements/Tabs,
current_subtab => $current_subtab,
Title => $title,
DashboardObj => $DashboardObj &>
<& /Elements/ListActions, actions => \@results &>
-<form action="<%$RT::WebPath%>/Prefs/Dashboards/Subscription.html" method="post" enctype="multipart/form-data">
+<form action="<%$RT::WebPath%>/Dashboards/Subscription.html" method="post" enctype="multipart/form-data">
<input type="hidden" class="hidden" name="DashboardId" value="<% $SubscriptionObj->SubValue('DashboardId') %>" />
<input type="hidden" class="hidden" name="Privacy" value="<% $SubscriptionObj->SubValue('Privacy') %>" />
<table width="100%" border="0">
@@ -162,7 +162,7 @@
<%INIT>
-my $current_subtab = 'Prefs/Dashboards/Subscription.html?DashboardId=' . $DashboardId;
+my $current_subtab = 'Dashboards/Subscription.html?DashboardId=' . $DashboardId;
my ($title, @results);
my ($val, $msg);
@@ -219,7 +219,7 @@
if ($Unsubscribe) {
my ($ok, $msg) = $SubscriptionObj->Delete();
$ok || Abort("Couldn't unsubscribe to dashboard $DashboardId.");
- RT::Interface::Web::Redirect($RT::WebURL."Prefs/Dashboards/index.html?Unsubscribe=$DashboardId");
+ RT::Interface::Web::Redirect($RT::WebURL."Dashboards/index.html?Unsubscribe=$DashboardId");
}
# if hour is undefined, then they're looking at this for the first time
Modified: rt/branches/3.8-TESTING/html/Dashboards/index.html
==============================================================================
--- rt/branches/3.8-TESTING/html/Dashboards/index.html (original)
+++ rt/branches/3.8-TESTING/html/Dashboards/index.html Mon May 5 19:59:59 2008
@@ -46,8 +46,8 @@
%#
%# END BPS TAGGED BLOCK }}}
<& /Elements/Header, title => $title &>
-<& /Prefs/Dashboards/Elements/Tabs,
- current_subtab => 'Prefs/Dashboards/index.html',
+<& /Dashboards/Elements/Tabs,
+ current_subtab => 'Dashboards/index.html',
Title => $title &>
<& /Elements/ListActions,
@@ -55,18 +55,18 @@
? [loc("Unsubscribed to dashboard [_1]", $Unsubscribe)]
: [] &>
-<& /Prefs/Dashboards/Elements/ShowDashboards,
+<& /Dashboards/Elements/ShowDashboards,
Type => "Personal",
Dashboards => \@personal_dashboards,
&>
-<& /Prefs/Dashboards/Elements/ShowDashboards,
+<& /Dashboards/Elements/ShowDashboards,
Type => "System",
Dashboards => \@system_dashboards,
&>
% for my $group (sort keys %group_dashboards) {
- <& /Prefs/Dashboards/Elements/ShowDashboards,
+ <& /Dashboards/Elements/ShowDashboards,
Type => $group,
Dashboards => $group_dashboards{$group},
&>
@@ -83,7 +83,7 @@
my @objs = RT::Dashboard->new($session{CurrentUser})->_PrivacyObjects(ShowSystem => 1);
for my $object (@objs) {
- for my $dashboard ($m->comp("/Prefs/Dashboards/Elements/DashboardsForObject", Object => $object)) {
+ for my $dashboard ($m->comp("/Dashboards/Elements/DashboardsForObject", Object => $object)) {
if ($object->isa('RT::System')) {
push @system_dashboards, $dashboard;
}
Modified: rt/branches/3.8-TESTING/html/User/Elements/Tabs
==============================================================================
--- rt/branches/3.8-TESTING/html/User/Elements/Tabs (original)
+++ rt/branches/3.8-TESTING/html/User/Elements/Tabs Mon May 5 19:59:59 2008
@@ -68,7 +68,7 @@
path => 'Prefs/MyRT.html',
},
s => { title => loc('Dashboards'),
- path => 'Prefs/Dashboards/index.html',
+ path => 'Dashboards/index.html',
},
t => { title => loc('Other'),
path => 'Prefs/Other.html',
Modified: rt/branches/3.8-TESTING/t/web/dashboards.t
==============================================================================
--- rt/branches/3.8-TESTING/t/web/dashboards.t (original)
+++ rt/branches/3.8-TESTING/t/web/dashboards.t Mon May 5 19:59:59 2008
@@ -17,19 +17,18 @@
ok $m->login(customer => 'customer'), "logged in";
-$m->get_ok($url."Prefs/Dashboards/index.html");
+$m->get_ok($url."Dashboards/index.html");
$m->content_lacks("New dashboard", "No 'new dashboard' link because we have no ModifyDashboard");
-$m->get_ok($url."Prefs/Dashboards/Modify.html?Create=1");
+$m->get_ok($url."Dashboards/Modify.html?Create=1");
$m->form_name('ModifyDashboard');
-
$m->field("Name" => 'test dashboard');
$m->click_button(value => 'Save Changes');
$m->content_contains("No permission to create dashboards");
$user_obj->PrincipalObj->GrantRight(Right => 'ModifyDashboard');
-$m->get_ok($url."Prefs/Dashboards/index.html");
+$m->get_ok($url."Dashboards/index.html");
$m->content_contains("New dashboard", "'New dashboard' link because we now have ModifyDashboard");
$m->follow_link_ok({text => "New dashboard"});
More information about the Rt-commit
mailing list