[Rt-commit] r19245 - in rt/3.8/trunk: . share/html/Dashboards/Elements/ShowPortlet

[sartak at bestpractical.com]

Author: sartak
Date: Thu Apr 16 20:27:44 2009
New Revision: 19245

Added:
   rt/3.8/trunk/share/html/Dashboards/Elements/ShowPortlet/dashboard
Modified:
   rt/3.8/trunk/   (props changed)
   rt/3.8/trunk/share/html/Dashboards/Render.html

Log:
 r82241 at onn:  sartak | 2009-04-16 20:27:34 -0400
 Factor out rendering of a dashboard's elements into its own ShowPortlet template


Added: rt/3.8/trunk/share/html/Dashboards/Elements/ShowPortlet/dashboard
==============================================================================
--- (empty file)
+++ rt/3.8/trunk/share/html/Dashboards/Elements/ShowPortlet/dashboard	Thu Apr 16 20:27:44 2009
@@ -0,0 +1,73 @@
+%# BEGIN BPS TAGGED BLOCK {{{
+%# 
+%# COPYRIGHT:
+%# 
+%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
+%#                                          <jesse at 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
+%# you are the copyright holder for those contributions and you grant
+%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+%# 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 }}}
+<%args>
+$Dashboard
+$Pane
+$Portlet
+$Rows => 20
+$Preview => 0
+$Depth => 0
+</%args>
+<%init>
+my $current_dashboard = $Portlet;
+my @panes = @{ $current_dashboard->Panes->{$Pane} || [] };
+</%init>
+
+<%perl>
+for my $portlet (@panes) {
+    $m->comp($portlet->{portlet_type},
+        Portlet   => $portlet,
+        Rows      => $Rows,
+        Preview   => $Preview,
+        Dashboard => $current_dashboard,
+        Pane      => $Pane,
+        Depth     => $Depth + 1,
+    );
+}
+</%perl>
+

Modified: rt/3.8/trunk/share/html/Dashboards/Render.html
==============================================================================
--- rt/3.8/trunk/share/html/Dashboards/Render.html	(original)
+++ rt/3.8/trunk/share/html/Dashboards/Render.html	Thu Apr 16 20:27:44 2009
@@ -58,14 +58,12 @@
 <tr valign="top">
 
 <td class="boxcontainer">
-% $show_cb->($_, 'body') foreach @{ $panes{body} || [] };
+% $show_cb->('body');
 </td>
 
-% if (@{ $panes{sidebar} || [] }) {
 <td class="boxcontainer">
-% $show_cb->($_, 'sidebar') foreach @{ $panes{sidebar} || [] };
+% $show_cb->('sidebar');
 </td>
-% }
 
 </tr></table>
 </td>
@@ -84,35 +82,30 @@
 Abort(loc("Couldn't load dashboard [_1]: [_2]", $id, $msg)) if !$ok;
 
 my $SubscriptionObj = RT::Attribute->new($session{'CurrentUser'});
-my $Loaded = 0;
+my $rows = 20;
 
-# try to load the subscription to this id
+# try to load the subscription to this id to get a better idea of number of rows
 for my $sub ($session{'CurrentUser'}->UserObj->Attributes->Named('Subscription')) {
     next unless $sub->SubValue('DashboardId') == $id;
     $SubscriptionObj = $sub;
-    $Loaded = 1;
+    $rows = $SubscriptionObj->SubValue('Rows');
     last;
 }
 
-my $rows = $Loaded ? $SubscriptionObj->SubValue('Rows') : 20;
 my $title = loc 'Dashboard [_1]', $DashboardObj->Name;
 
-my %panes = %{ $DashboardObj->Panes };
-
 my $show_cb = sub {
-    my $portlet = shift;
     my $pane = shift;
-
-    my $portlet_type = $portlet->{portlet_type};
-    my $comp = "Elements/ShowPortlet/$portlet_type";
-    $m->comp($comp,
-        Portlet   => $portlet,
+    $m->comp('Elements/ShowPortlet/dashboard',
+        Portlet   => $DashboardObj,
         Rows      => $rows,
         Preview   => $Preview,
         Dashboard => $DashboardObj,
         Pane      => $pane,
+        Depth     => 0,
     );
 };
+
 </%INIT>
 <%ARGS>
 $id => undef