diff --git a/app/Http/Middleware/SubscribersConfigured.php b/app/Http/Middleware/SubscribersConfigured.php index a8bc4056fb3c..adcdd7bfe84b 100644 --- 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 index 8621e6f7902d..47502ed236e2 100644 --- 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 index 8ad938bb2e04..c0f956b298b7 100644 --- a/app/Notifications/Incident/NewIncidentNotification.php +++ b/app/Notifications/Incident/NewIncidentNotification.php @@ -128,13 +128,12 @@ public function toSlack($notifiable) ->$status() ->content($content) ->attachment(function ($attachment) use ($notifiable) { - $attachment->title(trans('notifications.incident.new.slack.title', [$this->incident->name])) + $attachment->title(trans('notifications.incident.new.slack.title', ['name' => $this->incident->name])) ->timestamp($this->incident->getWrappedObject()->occurred_at) ->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 index 2ba73596bc95..b86c61def79e 100644 --- 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 index 55c0f9263168..bba28c24c58a 100644 --- a/resources/views/dashboard/subscribers/index.blade.php +++ b/resources/views/dashboard/subscribers/index.blade.php @@ -8,7 +8,7 @@ {{ trans('dashboard.subscribers.subscribers') }} - @if($currentUser->isAdmin && $enableSubscribers) + @if($currentUser->isAdmin) {{ trans('dashboard.subscribers.add.title') }} @@ -19,11 +19,7 @@

- @if($enableSubscribers) {{ trans('dashboard.subscribers.description') }} - @else - {{ trans('dashboard.subscribers.description_disabled') }} - @endif

@@ -51,6 +47,7 @@ @endif