projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
default to a session cookie instead of setting an explicit timeout, weird timezone...
[freeside.git]
/
rt
/
share
/
html
/
Dashboards
/
Queries.html
diff --git
a/rt/share/html/Dashboards/Queries.html
b/rt/share/html/Dashboards/Queries.html
index
bef0eee
..
8ac1475
100644
(file)
--- a/
rt/share/html/Dashboards/Queries.html
+++ b/
rt/share/html/Dashboards/Queries.html
@@
-2,7
+2,7
@@
%#
%# COPYRIGHT:
%#
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-201
1
Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-201
9
Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
@@
-46,12
+46,7
@@
%#
%# END BPS TAGGED BLOCK }}}
<& /Elements/Header, Title => $title &>
%#
%# END BPS TAGGED BLOCK }}}
<& /Elements/Header, Title => $title &>
-<& /Dashboards/Elements/Tabs,
- current_subtab => $current_subtab,
- Title => $title,
- DashboardObj => $Dashboard &>
-
-<& /Widgets/SelectionBox:header, nojs => 1 &>
+<& /Elements/Tabs &>
<& /Elements/ListActions, actions => \@results &>
<& /Elements/ListActions, actions => \@results &>
@@
-68,7
+63,7
@@
<&| /Widgets/TitleBox, title => $pane->{DisplayName} &>
% my ( $pane_name ) = $pane->{Name} =~ /Searches-(.+)/;
<&| /Widgets/TitleBox, title => $pane->{DisplayName} &>
% my ( $pane_name ) = $pane->{Name} =~ /Searches-(.+)/;
- <& /Widgets/SelectionBox:show, self => $pane,
nojs => 1,
grep( {
+ <& /Widgets/SelectionBox:show, self => $pane, grep( {
$_->{pane} eq $pane_name} @deleted ) ? ( ShowUpdate => 1 ) : () &>
</&>
</form>
$_->{pane} eq $pane_name} @deleted ) ? ( ShowUpdate => 1 ) : () &>
</&>
</form>
@@
-78,14
+73,13
@@
<%INIT>
<%INIT>
-my $current_subtab = 'Dashboards/Queries.html?id=' . $id;
my @results;
use RT::Dashboard;
my @results;
use RT::Dashboard;
-my $Dashboard =
new RT::Dashboard
($session{'CurrentUser'});
+my $Dashboard =
RT::Dashboard->new
($session{'CurrentUser'});
my ($ok, $msg) = $Dashboard->LoadById($id);
$ok || Abort(loc("Couldn't load dashboard [_1]: [_2]", $id, $msg));
my ($ok, $msg) = $Dashboard->LoadById($id);
$ok || Abort(loc("Couldn't load dashboard [_1]: [_2]", $id, $msg));
-my $title = loc("Modify the
queries
of dashboard [_1]", $Dashboard->Name);
+my $title = loc("Modify the
content
of dashboard [_1]", $Dashboard->Name);
my %desc_of;
my @items;
my %desc_of;
my @items;
@@
-97,20
+91,21
@@
my @components = @{ RT->Config->Get('HomepageComponents') };
for my $desc (@components) {
my $name = "component-$desc";
for my $desc (@components) {
my $name = "component-$desc";
- push @items, [$name,
$desc
];
- $desc_of{$name} =
$desc
;
+ push @items, [$name,
loc($desc)
];
+ $desc_of{$name} =
loc($desc)
;
$still_exists{$name} = 1;
}
# add dashboards
$still_exists{$name} = 1;
}
# add dashboards
-my
$dashboards = $m->comp("/Dashboards/Elements/DashboardsForObjects", flatten => 1
);
-for my $dashboard (@
{ $dashboards || [] }
) {
+my
@dashboards = $m->comp("/Dashboards/Elements/ListOfDashboards"
);
+for my $dashboard (@
dashboards
) {
# Users *can* set up mutually recursive dashboards, but don't make it THIS
# easy for them to shoot themselves in the foot.
next if $dashboard->Id == $Dashboard->Id;
my $name = 'dashboard-' . $dashboard->Id . '-' . $dashboard->Privacy;
# Users *can* set up mutually recursive dashboards, but don't make it THIS
# easy for them to shoot themselves in the foot.
next if $dashboard->Id == $Dashboard->Id;
my $name = 'dashboard-' . $dashboard->Id . '-' . $dashboard->Privacy;
- my $desc = "Dashboard: " . $dashboard->Name;
+ my $type = loc('Dashboard'); # loc
+ my $desc = "$type: " . $dashboard->Name;
push @items, [$name, $desc];
$desc_of{$name} = $desc;
$still_exists{$name} = 1;
push @items, [$name, $desc];
$desc_of{$name} = $desc;
$still_exists{$name} = 1;
@@
-119,16
+114,18
@@
for my $dashboard (@{ $dashboards || [] }) {
# add saved searches
my @objs = RT::System->new($session{'CurrentUser'});
# add saved searches
my @objs = RT::System->new($session{'CurrentUser'});
-push @objs, RT::SavedSearch
es->new( $session{CurrentUser} )->_PrivacyObjects
+push @objs, RT::SavedSearch
->new( $session{CurrentUser} )->ObjectsForLoading
if $session{'CurrentUser'}->HasRight( Right => 'LoadSavedSearch',
Object => $RT::System );
for my $object (@objs) {
for ($m->comp("/Search/Elements/SearchesForObject", Object => $object)) {
if $session{'CurrentUser'}->HasRight( Right => 'LoadSavedSearch',
Object => $RT::System );
for my $object (@objs) {
for ($m->comp("/Search/Elements/SearchesForObject", Object => $object)) {
- my ($desc, $search) = @$_;
+ my ($desc, $
loc_desc, $
search) = @$_;
my $SearchType = $search->Content->{'SearchType'} || 'Ticket';
my $SearchType = $search->Content->{'SearchType'} || 'Ticket';
- my $type = ($SearchType eq 'Ticket') ? 'Saved Search' : $SearchType; # loc
- $desc = "$type: $desc";
+ my $type = ( $SearchType eq 'Ticket' )
+ ? 'Saved Search' # loc
+ : $SearchType;
+ $desc = loc($type) . ": $loc_desc";
my $privacy = $Dashboard->_build_privacy($object);
my $name = 'search-' . $search->Id . '-' . $privacy;
push @items, [$name, $desc];
my $privacy = $Dashboard->_build_privacy($object);
my $name = 'search-' . $search->Id . '-' . $privacy;
push @items, [$name, $desc];
@@
-137,7
+134,7
@@
for my $object (@objs) {
}
}
}
}
-# Get the list of
querie
s already in use
+# Get the list of
portlet
s already in use
my @deleted;
do {
my $panes = $Dashboard->Panes;
my @deleted;
do {
my $panes = $Dashboard->Panes;
@@
-177,7
+174,7
@@
$m->callback(
selected => \%selected,
);
selected => \%selected,
);
-# Create selectionbox widgets for those
querie
s
+# Create selectionbox widgets for those
portlet
s
my %pane_name = (
'body' => loc('Body'),
my %pane_name = (
'body' => loc('Body'),
@@
-191,7
+188,7
@@
$m->callback(
);
my @panes;
);
my @panes;
-for my $pane (keys %pane_name) {
+for my $pane (
sort
keys %pane_name) {
my $sel = $m->comp(
'/Widgets/SelectionBox:new',
Action => 'Queries.html',
my $sel = $m->comp(
'/Widgets/SelectionBox:new',
Action => 'Queries.html',
@@
-269,7
+266,7
@@
for my $pane (keys %pane_name) {
push @panes, $sel;
}
push @panes, $sel;
}
-$m->comp('/Widgets/SelectionBox:process', %ARGS, self => $_
, nojs => 1
)
+$m->comp('/Widgets/SelectionBox:process', %ARGS, self => $_
)
for @panes;
my @hidden_searches = $Dashboard->PossibleHiddenSearches;
for @panes;
my @hidden_searches = $Dashboard->PossibleHiddenSearches;