Merge pull request #3423 from AntonioKL/patching-manage-subscribtion

Patching manage subscription
cachethq · Jul 11, 2019 · 163f78f · 163f78f
2 parents fabd18d + 4747014
commit 163f78f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 14 deletions.
diff --git a/app/Http/Middleware/SubscribersConfigured.php b/app/Http/Middleware/SubscribersConfigured.php
@@ -52,10 +52,6 @@ public function __construct(Repository $config)
      */
     public function handle(Request $request, Closure $next)
     {
-        if (!$this->config->get('setting.enable_subscribers')) {
-            return cachet_redirect('status-page');
-        }
-
         return $next($request);
     }
 }
diff --git a/app/Notifications/Component/ComponentStatusChangedNotification.php b/app/Notifications/Component/ComponentStatusChangedNotification.php
@@ -140,7 +140,7 @@ public function toSlack($notifiable)
 
         return (new SlackMessage())
                     ->$status()
-                    ->content(trans('notifications.component.status_update.slack.subject'))
+                    ->content(trans('notifications.component.status_update.slack.title'))
                     ->attachment(function ($attachment) use ($content, $notifiable) {
                         $attachment->title($content, cachet_route('status-page'))
                                    ->fields(array_filter([

diff --git a/app/Notifications/Incident/NewIncidentNotification.php b/app/Notifications/Incident/NewIncidentNotification.php
@@ -133,8 +133,7 @@ public function toSlack($notifiable)
                                    ->fields(array_filter([
                                         'ID'   => "#{$this->incident->id}",
                                         'Link' => $this->incident->permalink,
-                                    ]))
-                                   ->footer(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)]));
+                                    ]));
                     });
     }
 }
diff --git a/app/Notifications/Schedule/NewScheduleNotification.php b/app/Notifications/Schedule/NewScheduleNotification.php
@@ -124,8 +124,7 @@ public function toSlack($notifiable)
                                    ->fields(array_filter([
                                         'ID'     => "#{$this->schedule->id}",
                                         'Status' => $this->schedule->human_status,
-                                    ]))
-                                   ->footer(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)]));
+                                    ]));
                     });
     }
 }
diff --git a/resources/views/dashboard/subscribers/index.blade.php b/resources/views/dashboard/subscribers/index.blade.php
@@ -8,7 +8,7 @@
     <span class="uppercase">
         <i class="ion ion-ios-email-outline"></i> {{ trans('dashboard.subscribers.subscribers') }}
     </span>
-    @if($currentUser->isAdmin && $enableSubscribers)
+    @if($currentUser->isAdmin)
     <a class="btn btn-md btn-success pull-right" href="{{ cachet_route('dashboard.subscribers.create') }}">
         {{ trans('dashboard.subscribers.add.title') }}
     </a>
@@ -19,11 +19,7 @@
     <div class="row">
         <div class="col-sm-12">
             <p class="lead">
-                @if($enableSubscribers)
                 {{ trans('dashboard.subscribers.description') }}
-                @else
-                {{ trans('dashboard.subscribers.description_disabled') }}
-                @endif
             </p>
 
             <div class="striped-list">
@@ -51,6 +47,7 @@
                         @endif
                     </div>
                     <div class="col-xs-3 text-right">
+                        <a href="{{ cachet_route('subscribe.manage', $subscriber->verify_code) }}" target="_blank" class="btn btn-success">{{ trans('forms.edit') }}</a>
                         <a href="{{ cachet_route('dashboard.subscribers.delete', [$subscriber->id], 'delete') }}" class="btn btn-danger confirm-action" data-method='DELETE'>{{ trans('forms.delete') }}</a>
                     </div>
                 </div>