[Rt-commit] r13823 - in rt/3.8/trunk: .

[sartak at bestpractical.com]

Author: sartak
Date: Mon Jul  7 10:37:06 2008
New Revision: 13823

Modified:
   rt/3.8/trunk/   (props changed)
   rt/3.8/trunk/share/html/Dashboards/Subscription.html
   rt/3.8/trunk/share/html/Dashboards/index.html

Log:
 r63761 at onn:  sartak | 2008-07-07 10:29:25 -0400
 Remove dashboard unsubscribe, it's going to instead be a frequency setting


Modified: rt/3.8/trunk/share/html/Dashboards/Subscription.html
==============================================================================
--- rt/3.8/trunk/share/html/Dashboards/Subscription.html	(original)
+++ rt/3.8/trunk/share/html/Dashboards/Subscription.html	Mon Jul  7 10:37:06 2008
@@ -154,8 +154,6 @@
 
 % if ($SubscriptionObj->Id) {
     <& /Elements/Submit, Name => "Save", Label => loc('Save Changes') &>
-    <br />
-    <& /Elements/Submit, Name => "Unsubscribe", Label => loc('Unsubscribe') &>
 % } else {
     <& /Elements/Submit, Name => "Save", Label => loc('Subscribe') &>
 % }
@@ -189,14 +187,6 @@
 ($val, $msg) = $DashboardObj->LoadById($DashboardId);
 $val || Abort(loc("Couldn't load dashboard [_1]: [_2].", $DashboardId, $msg));
 
-if ($SubscriptionObj->Id && $Unsubscribe) {
-    my ($ok, $msg) = $SubscriptionObj->Delete();
-    $ok || Abort(loc("Couldn't unsubscribe to dashboard [_1]: [_2]", $DashboardId, $msg));
-
-    # put the user back into a useful place with a message
-    RT::Interface::Web::Redirect(RT->Config->Get('WebURL')."Dashboards/index.html?Unsubscribed=$DashboardId");
-}
-
 my %fields = (
     DashboardId => $DashboardId,
     Frequency   => 'daily',
@@ -274,6 +264,5 @@
 $Dow         => undef
 $Dom         => undef
 $Rows        => undef
-$Unsubscribe => undef
 </%ARGS>
 

Modified: rt/3.8/trunk/share/html/Dashboards/index.html
==============================================================================
--- rt/3.8/trunk/share/html/Dashboards/index.html	(original)
+++ rt/3.8/trunk/share/html/Dashboards/index.html	Mon Jul  7 10:37:06 2008
@@ -77,24 +77,12 @@
 my $dashboards = $m->comp("/Dashboards/Elements/DashboardsForObjects", Objects => \@objs);
 
 my @actions;
-if (defined $Unsubscribed) {
-    my $Dashboard = RT::Dashboard->new($session{'CurrentUser'});
-    $Dashboard->LoadById($Unsubscribed);
-    if ($Dashboard->Id) {
-        push @actions, loc("Unsubscribed to dashboard [_1]", $Dashboard->Name);
-    }
-    else {
-        push @actions, loc("Unable to unsubscribe to dashboard [_1]", $Unsubscribed);
-    }
-}
-
 if (defined $Deleted) {
     push @actions, loc("Deleted dashboard [_1]", $Deleted);
 }
 
 </%INIT>
 <%ARGS>
-$Unsubscribed => undef
 $Deleted => undef
 </%ARGS>