Merge pull request #81 from herpaderpaldent/develop

Version 2.0.1
herpaderpaldent · Aug 26, 2019 · 7ec19cc · 7ec19cc
2 parents cf93781 + 769dd75
commit 7ec19cc
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# Version 2.0.1
+* Little reminder to [warlof](https://github.com/warlof): you own this package as well. Consider using as blueprint for core?
+* Added loading note during ajax call
+* Fix missing class declaration in KillmailNotification causing error for private notification
+
 # Version 2.0.0
 This major release revamps seat-notifications significantly. Thanks to new co-author [warlof](https://github.com/warlof), we majorly refactoring all of seat-notification in order to introduce new notifications from within this package or from a third party application with ease.
 

diff --git a/src/Notifications/KillMail/DiscordKillMailNotification.php b/src/Notifications/KillMail/DiscordKillMailNotification.php
@@ -28,6 +28,7 @@
 use Herpaderpaldent\Seat\SeatNotifications\Channels\Discord\DiscordChannel;
 use Herpaderpaldent\Seat\SeatNotifications\Channels\Discord\DiscordMessage;
 use Seat\Eveapi\Models\Sde\InvType;
+use Seat\Web\Models\Group;
 
 class DiscordKillMailNotification extends AbstractKillMailNotification
 {
@@ -38,7 +39,9 @@ class DiscordKillMailNotification extends AbstractKillMailNotification
     public function via($notifiable)
     {
 
-        array_push($this->tags, is_null($notifiable->group_id) ? 'to channel' : 'private to: ' . $this->getMainCharacter(Group::find($notifiable->group_id))->name);
+        array_push($this->tags, is_null($notifiable->group_id) ?
+            'to channel' :
+            'private to: ' . $this->getMainCharacter(Group::find($notifiable->group_id))->name);
 
         return [DiscordChannel::class];
     }

diff --git a/src/Notifications/KillMail/SlackKillMailNotification.php b/src/Notifications/KillMail/SlackKillMailNotification.php
@@ -28,6 +28,7 @@
 use Herpaderpaldent\Seat\SeatNotifications\Channels\Slack\SlackChannel;
 use Herpaderpaldent\Seat\SeatNotifications\Channels\Slack\SlackMessage;
 use Seat\Eveapi\Models\Sde\InvType;
+use Seat\Web\Models\Group;
 
 class SlackKillMailNotification extends AbstractKillMailNotification
 {
@@ -38,7 +39,9 @@ class SlackKillMailNotification extends AbstractKillMailNotification
     public function via($notifiable)
     {
 
-        array_push($this->tags, is_null($notifiable->group_id) ? 'to channel' : 'private to: ' . $this->getMainCharacter(Group::find($notifiable->group_id))->name);
+        array_push($this->tags, is_null($notifiable->group_id) ?
+            'to channel' :
+            'private to: ' . $this->getMainCharacter(Group::find($notifiable->group_id))->name);
 
         return [SlackChannel::class];
     }

diff --git a/src/config/seatnotifications.config.php b/src/config/seatnotifications.config.php
@@ -24,5 +24,5 @@
  */
 
 return [
-    'version'   => '2.0.0',
+    'version'   => '2.0.1',
 ];
diff --git a/src/resources/views/index.blade.php b/src/resources/views/index.blade.php
@@ -60,6 +60,7 @@
 
         // request a list of available channels to the driver
         availableChannels.select2({
+          placeholder: 'loading...',
           width: '100%',
         });
 
@@ -72,6 +73,11 @@
             'driver': event.relatedTarget.dataset.driver,
             'notification' : event.relatedTarget.dataset.notification
           },
+          complete: function () {
+            availableChannels.select2({
+              width: '100%',
+            });
+          }
         }).then(function (channels) {
 
           channels.forEach(function (channel) {