Merge pull request #26 from symbiote/feature-broadcast-link

new(BroadcastNotification) Added a new Link field for a broadcast notification
symbiote · Apr 10, 2019 · c7ff2ac · c7ff2ac
2 parents 13e8bc0 + 09be549
commit c7ff2ac
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 12 deletions.
diff --git a/src/Model/BroadcastNotification.php b/src/Model/BroadcastNotification.php
@@ -8,8 +8,7 @@
 use SilverStripe\Core\Injector\Injector;
 use Symbiote\Notifications\Service\NotificationService;
 use SilverStripe\Forms\ListboxField;
-
-
+use Symbiote\MultiValueField\Fields\KeyValueField;
 
 class BroadcastNotification extends DataObject implements NotifiedOn
 {
@@ -20,6 +19,7 @@ class BroadcastNotification extends DataObject implements NotifiedOn
         'Content' => 'Text',
         'SendNow' => 'Boolean',
         'IsPublic'  => 'Boolean',
+        'Context' => 'MultiValueField'
     ];
 
     private static $many_many = [
@@ -43,28 +43,28 @@ public function getCMSFields()
         $fields = parent::getCMSFields();
 
         $fields->dataFieldByName('IsPublic')->setRightTitle('Indicate whether this can be displayed to public users');
-        
+
         if ($this->ID) {
             $fields->dataFieldByName('SendNow')->setRightTitle('If selected, this notification will be broadcast to all users in groups selected below');
 
             $fields->removeByName('Groups');
 
             $fields->addFieldToTab('Root.Main', ListboxField::create('Groups', 'Groups', Group::get()));
-
         } else {
             $fields->removeByName('SendNow');
         }
 
-
+        $context = KeyValueField::create('Context')->setRightTitle('Add a Link and Title field here to provide context for this message');
+
+        $fields->replaceField('Context', $context);
 
         return $fields;
     }
 
     public function getAvailableKeywords()
     {
-        return [
-            'Content'
-        ];
+        $fields = $this->getNotificationTemplateData();
+        return array_keys($fields);
     }
 
     /**
@@ -74,9 +74,12 @@ public function getAvailableKeywords()
      */
     public function getNotificationTemplateData()
     {
-        return [
-            'Content' => $this->Content
-        ];
+        $fields = $this->Context->getValues();
+        if (!is_array($fields)) {
+            $fields = [];
+        }
+        $fields['Content'] = $this->Content;
+        return $fields;
     }
 
     /**
@@ -94,4 +97,10 @@ public function getRecipients($event)
         }
         return [];
     }
+
+    public function Link()
+    {
+        $context = $this->Context->getValues();
+        return isset($context['Link']) ? $context['Link'] : null;
+    }
 }
diff --git a/src/Model/InternalNotification.php b/src/Model/InternalNotification.php
@@ -6,7 +6,7 @@
 use SilverStripe\Security\Member;
 use SilverStripe\Security\Security;
 use Symbiote\MultiValueField\ORM\FieldType\MultiValueField;
-
+use Symbiote\MultiValueField\Fields\KeyValueField;
 
 class InternalNotification extends DataObject {
     private static $table_name = 'InternalNotification';
@@ -31,6 +31,14 @@ class InternalNotification extends DataObject {
 
     private static $default_sort = 'ID DESC';
 
+    public function getCMSFields()
+    {
+        $fields = parent::getCMSFields();
+
+        $fields->replaceField('Context', KeyValueField::create('Context'));
+        return $fields;
+    }
+
     public function canView($member = null) {
         $member = $member ?: Security::getCurrentUser();
         if (!$member) {