[Rt-commit] r18165 - in rt/3.999/branches/merge_to_3.8.2: share/html/Dashboards

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Wed Feb  4 02:52:45 2009
New Revision: 18165

Modified:
   rt/3.999/branches/merge_to_3.8.2/   (props changed)
   rt/3.999/branches/merge_to_3.8.2/share/html/Dashboards/Render.html
   rt/3.999/branches/merge_to_3.8.2/share/html/Dashboards/Subscription.html

Log:
 r19497 at sunnavys-mb:  sunnavy | 2009-02-04 13:59:08 +0800
 case fixes for share/html/Dashboards 


Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Dashboards/Render.html
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Dashboards/Render.html	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Dashboards/Render.html	Wed Feb  4 02:52:45 2009
@@ -51,7 +51,7 @@
 <& /Dashboards/Elements/Tabs,
     current_subtab => $current_subtab,
     title => $title,
-    dashboard_obj => $DashboardObj &>
+    dashboard_obj => $dashboard_obj &>
 % }
 
 <table class="dashboard">
@@ -79,8 +79,8 @@
 my $current_subtab = 'Dashboards/Render.html?id=' . $id;
 
 use RT::Dashboard;
-my $DashboardObj = RT::Dashboard->new( current_user => Jifty->web->current_user );
-my ($ok, $msg) = $DashboardObj->load_by_id($id);
+my $dashboard_obj = RT::Dashboard->new( current_user => Jifty->web->current_user );
+my ($ok, $msg) = $dashboard_obj->load_by_id($id);
 abort(_("Couldn't load dashboard %1: %2", $id, $msg)) if !$ok;
 
 my $SubscriptionObj = RT::Model::Attribute->new( current_user => Jifty->web->current_user );
@@ -106,7 +106,7 @@
     $m->comp($component,
         portlet   => $portlet,
         rows      => $rows,
-        preview   => $Preview,
+        preview   => $preview,
         dashboard => $dashboard_obj,
     );
 };

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Dashboards/Subscription.html
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Dashboards/Subscription.html	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Dashboards/Subscription.html	Wed Feb  4 02:52:45 2009
@@ -49,7 +49,7 @@
 <& /Dashboards/Elements/Tabs,
     current_subtab => $current_subtab,
     title => $title,
-    dashboard_obj => $DashboardObj &>
+    dashboard_obj => $dashboard_obj &>
 
 <& /Elements/ListActions, actions => \@results &>
 
@@ -65,7 +65,7 @@
 <tr><td class="label">
 <&|/l&>Dashboard</&>:
 </td><td class="value">
-<% $DashboardObj->name %>
+<% $dashboard_obj->name %>
 </td></tr>
 
 <tr><td class="label">
@@ -187,7 +187,7 @@
 my $timezone = Jifty->web->current_user->user_object->timezone || RT->config->get('Timezone');
 
 use RT::Dashboard;
-my $DashboardObj = RT::Dashboard->new( current_user => Jifty->web->current_user );
+my $dashboard_obj = RT::Dashboard->new( current_user => Jifty->web->current_user );
 
 my $SubscriptionObj = RT::Model::Attribute->new( current_user => Jifty->web->current_user );
 
@@ -202,7 +202,7 @@
              ? $SubscriptionObj->sub_value('dashboard_id')
              : $ARGS{'dashboard_id'};
 
-($val, $msg) = $DashboardObj->load_by_id($dashboard_id);
+($val, $msg) = $dashboard_obj->load_by_id($dashboard_id);
 $val || abort(_("Couldn't load dashboard %1: %2.", $dashboard_id, $msg));
 
 my %fields = (
@@ -248,7 +248,7 @@
     # create
     else {
         abort(_("Unable to subscribe to dashboard %1: Permission denied", $dashboard_id))
-            unless $DashboardObj->current_user_can_subscribe;
+            unless $dashboard_obj->current_user_can_subscribe;
 
         my ($val, $msg) = $SubscriptionObj->create(
             name        => 'Subscription',
@@ -258,7 +258,7 @@
             content     => \%fields,
         );
         if ($val) {
-            push @results, _("Subscribed to dashboard %1", $DashboardObj->name);
+            push @results, _("Subscribed to dashboard %1", $dashboard_obj->name);
             push @results, _("Warning: you have no email address set, so you will not receive this dashboard until you have it set")
                 unless Jifty->web->current_user->email || $fields{recipient};
         }
@@ -269,10 +269,10 @@
 }
 
 if ($SubscriptionObj->id) {
-    $title = _("Modify the subscription to dashboard %1", $DashboardObj->name);
+    $title = _("Modify the subscription to dashboard %1", $dashboard_obj->name);
 }
 else {
-    $title = _("Subscribe to dashboard %1", $DashboardObj->name);
+    $title = _("Subscribe to dashboard %1", $dashboard_obj->name);
 }
 
 </%INIT>