X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FDashboards%2FElements%2FShowDashboards;h=a1d41bb2438e66830f5ccf29066c1d3759b1cf03;hb=679854b8bbc65d112071111bbd7f34a6a481fb30;hp=d7014b943c026c9e86044c425108e1fe1f22ad71;hpb=b4b0c7e72d7eaee2fbfc7022022c9698323203dd;p=freeside.git

diff --git a/rt/share/html/Dashboards/Elements/ShowDashboards b/rt/share/html/Dashboards/Elements/ShowDashboards
index d7014b943..a1d41bb24 100644
--- a/rt/share/html/Dashboards/Elements/ShowDashboards
+++ b/rt/share/html/Dashboards/Elements/ShowDashboards
@@ -1,40 +1,40 @@
 %# BEGIN BPS TAGGED BLOCK {{{
-%# 
+%#
 %# COPYRIGHT:
-%# 
-%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-%#                                          <jesse@bestpractical.com>
-%# 
+%#
+%# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC
+%#                                          <sales@bestpractical.com>
+%#
 %# (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,70 +43,29 @@
 %# 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 => $Title &>
-<& SELF:table, %ARGS &>
-</&>
-<%ARGS>
-$Title   => undef
-</%ARGS>
-
-<%METHOD table>
-<%ARGS>
-$Dashboards => undef
-$Verbose => 1
-</%ARGS>
-<%INIT>
-# map each subscription to a dashboard ID
-my %subscription_for;
-
-for my $attr ($session{'CurrentUser'}->UserObj->Attributes->Named('Subscription')) {
-    $subscription_for{$attr->SubValue('DashboardId')} = $attr;
-}
-</%INIT>
-
-% if (@$Dashboards == 0) {
-%   if ($Verbose) {
-        <p><% loc("No dashboards.") %></p>
+% foreach my $Object (@Objects) {
+%   my $Dashboards = RT::Dashboards->new($session{CurrentUser});
+%   $Dashboards->LimitToPrivacy(join('-',ref($Object),$Object->Id));
+%   my $title;
+%   if (ref $Object eq 'RT::User' && $Object->Id == $session{CurrentUser}->Id) {
+%       $title = loc("My dashboards");
+%   } else {
+%       $title = loc("[_1]'s dashboards",$Object->Name);
 %   }
-% } else {
-    <table class="collection-as-table">
-        <tr class="collection-as-table">
-% if ($Verbose) {
-            <th class="collection-as-table"><% loc("#") %></th>
-% }
-            <th class="collection-as-table"><% loc("Name") %></th>
-            <th class="collection-as-table"><% loc("Subscription") %></th>
-        </tr>
-
-%   my $i = 0;
-%   for my $dashboard (@$Dashboards) {
-%       my $url = sprintf '%s/Dashboards/%d/%s',
-%                 RT->Config->Get('WebPath'),
-%                 $dashboard->Id,
-%                 $dashboard->Name;
-
-        <tr class="collection-as-table <% ++$i % 2 ? 'oddline' : 'evenline' %>">
-% if ($Verbose) {
-            <td class="collection-as-table">
-                <a href="<% $url %>">
-                    <% $dashboard->Id %>
-                </a>
-            </td>
-% }
-            <td class="collection-as-table">
-                <a href="<% $url %>">
-                    <% $dashboard->Name %>
-                </a>
-            </td>
-            <td class="collection-as-table">
-                <& /Dashboards/Elements/ShowSubscription, Dashboard => $dashboard, Subscription => $subscription_for{$dashboard->Id} &>
-            </td>
-        </tr>
-%   }
-
-    </table>
+%   $title = $m->interp->apply_escapes($title, 'h');
+<& /Elements/CollectionList,
+    %ARGS,
+    Format => qq{'<a href="__WebPath__/__ShowURL__">__Name__</a>/TITLE:$title', __Subscription__},
+    Collection => $Dashboards,
+&>
 % }
-</%METHOD>
+<%init>
+use RT::Dashboards;
 
+my @Objects = RT::Dashboard->new($session{CurrentUser})->ObjectsForLoading(IncludeSuperuserGroups => $IncludeSuperuserGroups);
+</%init>
+<%args>
+$IncludeSuperuserGroups => 1
+</%args>