From f75c9f5500af612d6663179329786b3a8beb5f55 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Wed, 16 Dec 2015 18:15:25 +0000 Subject: [PATCH 1/6] Fixes #1218 --- resources/views/partials/metrics.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/partials/metrics.blade.php b/resources/views/partials/metrics.blade.php index 602b4cb2..d0d5ec65 100644 --- a/resources/views/partials/metrics.blade.php +++ b/resources/views/partials/metrics.blade.php @@ -93,7 +93,7 @@ chartConfig.datasets[0].data = _.values(charter); charts[metricId].chart = new Chart(charts[metricId].context).Line(chartConfig, { - tooltipTemplate: $el.data('metric-name') + ": <%= value %> " + $el.data('metric-suffix'), + tooltipTemplate: $el.data('metric-name') + ": <{{ '%' }}= value %> " + $el.data('metric-suffix'), scaleShowVerticalLines: true, scaleShowLabels: false, responsive: true, From dabed137abaff2d7062a5702f814695abdc22348 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Thu, 17 Dec 2015 14:41:22 +0000 Subject: [PATCH 2/6] Fixes #1237 --- .../SendIncidentEmailNotificationHandler.php | 2 +- .../SendMaintenanceEmailNotificationHandler.php | 2 +- app/Models/Subscriber.php | 13 +++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php b/app/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php index 6e8ed357..94ccef00 100644 --- a/app/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php +++ b/app/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php @@ -65,7 +65,7 @@ class SendIncidentEmailNotificationHandler // Only send emails for public incidents. if ($event->incident->visible === 1) { - foreach ($this->subscriber->all() as $subscriber) { + foreach ($this->subscriber->isVerified()->get() as $subscriber) { $mail = [ 'email' => $subscriber->email, 'subject' => 'New incident reported.', diff --git a/app/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php b/app/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php index 70530ce2..877f2f08 100644 --- a/app/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php +++ b/app/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php @@ -62,7 +62,7 @@ class SendMaintenanceEmailNotificationHandler $data = AutoPresenter::decorate($event->incident); - foreach ($this->subscriber->all() as $subscriber) { + foreach ($this->subscriber->isVerified()->get() as $subscriber) { $mail = [ 'email' => $subscriber->email, 'subject' => 'Scheduled maintenance.', diff --git a/app/Models/Subscriber.php b/app/Models/Subscriber.php index 4d3adbe5..0b7c89b0 100644 --- a/app/Models/Subscriber.php +++ b/app/Models/Subscriber.php @@ -13,6 +13,7 @@ namespace CachetHQ\Cachet\Models; use AltThree\Validator\ValidatingTrait; use CachetHQ\Cachet\Presenters\SubscriberPresenter; +use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; use McCool\LaravelAutoPresenter\HasPresenter; @@ -62,6 +63,18 @@ class Subscriber extends Model implements HasPresenter }); } + /** + * Scope verified subscribers. + * + * @param \Illuminate\Database\Eloquent\Builder $query + * + * @return \Illuminate\Database\Eloquent\Builder + */ + public function scopeIsVerified(Builder $query) + { + return $query->whereNotNull('verified_at'); + } + /** * Determines if the subscriber is verified. * From d2beb6263e796e14db753ab06766fb60a7e4e2fc Mon Sep 17 00:00:00 2001 From: James Brooks Date: Fri, 18 Dec 2015 09:07:40 +0000 Subject: [PATCH 3/6] Remove indentation --- resources/views/dashboard/partials/errors.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/dashboard/partials/errors.blade.php b/resources/views/dashboard/partials/errors.blade.php index 3c5a29d9..a046ab7f 100644 --- a/resources/views/dashboard/partials/errors.blade.php +++ b/resources/views/dashboard/partials/errors.blade.php @@ -1,15 +1,15 @@ @if ($errors->any()) - @include('dashboard.partials._error', ['level' => 'danger', 'title' => Session::get('title'), 'message' => $errors->all(':message')]) +@include('dashboard.partials._error', ['level' => 'danger', 'title' => Session::get('title'), 'message' => $errors->all(':message')]) @endif @if ($message = Session::get('success')) - @include('dashboard.partials._error', ['level' => 'success', 'title' => Session::get('title'), 'message' => $message]) +@include('dashboard.partials._error', ['level' => 'success', 'title' => Session::get('title'), 'message' => $message]) @endif @if ($message = Session::get('warning')) - @include('dashboard.partials._error', ['level' => 'warning', 'title' => Session::get('title'), 'message' => $message]) +@include('dashboard.partials._error', ['level' => 'warning', 'title' => Session::get('title'), 'message' => $message]) @endif @if ($message = Session::get('info')) - @include('dashboard.partials._error', ['level' => 'info', 'title' => Session::get('title'), 'message' => $message]) +@include('dashboard.partials._error', ['level' => 'info', 'title' => Session::get('title'), 'message' => $message]) @endif From 7ff5da78b98390a93e1d28f6c31fe2199cd908f1 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Fri, 18 Dec 2015 12:48:05 +0000 Subject: [PATCH 4/6] Updated laravel --- composer.lock | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index f0010fc8..17ca9910 100644 --- a/composer.lock +++ b/composer.lock @@ -1726,16 +1726,16 @@ }, { "name": "laravel/framework", - "version": "v5.1.26", + "version": "v5.1.27", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "be7fbb60376bd61f07e9c637473e5b2cf7eebe5c" + "reference": "b16f80878fd3603022d3c84593397cedd9af0bcf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/be7fbb60376bd61f07e9c637473e5b2cf7eebe5c", - "reference": "be7fbb60376bd61f07e9c637473e5b2cf7eebe5c", + "url": "https://api.github.com/repos/laravel/framework/zipball/b16f80878fd3603022d3c84593397cedd9af0bcf", + "reference": "b16f80878fd3603022d3c84593397cedd9af0bcf", "shasum": "" }, "require": { @@ -1781,7 +1781,6 @@ "illuminate/events": "self.version", "illuminate/exception": "self.version", "illuminate/filesystem": "self.version", - "illuminate/foundation": "self.version", "illuminate/hashing": "self.version", "illuminate/http": "self.version", "illuminate/log": "self.version", @@ -1851,7 +1850,7 @@ "framework", "laravel" ], - "time": "2015-12-02 21:59:57" + "time": "2015-12-17 20:35:38" }, { "name": "league/commonmark", From 666da0125ea1b5d00d83f1b3f1728da5c14344d8 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Fri, 18 Dec 2015 12:50:27 +0000 Subject: [PATCH 5/6] Released 2.0.4 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c3d06e92..2165f8f9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.4-dev +2.0.4 From c1ab3a175c687628fa40d9cb3b169ffb3bdea70f Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Fri, 18 Dec 2015 12:51:20 +0000 Subject: [PATCH 6/6] Bumped version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 2165f8f9..d24fe4be 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.4 +2.0.5-dev