Merge pull request #323 from creative-commoners/pulls/5.0/ss4-updates

FIX Update ownerBaseClass in WorkflowApplicable for SS4 and convert to vendor module
symbiote · Oct 27, 2017 · 21e795b · 21e795b
2 parents f85cf3f + 8cad2d1
commit 21e795b
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 23 deletions.
diff --git a/code/admin/AdvancedWorkflowAdmin.php b/code/admin/AdvancedWorkflowAdmin.php
@@ -86,11 +86,9 @@ protected function init()
     {
         parent::init();
 
-        $module = ModuleLoader::getModule('symbiote/silverstripe-advancedworkflow');
-
-        Requirements::add_i18n_javascript($module->getRelativeResourcePath('client/lang'));
-        Requirements::javascript($module->getRelativeResourcePath('client/dist/js/advancedworkflow.js'));
-        Requirements::css($module->getRelativeResourcePath('client/dist/styles/advancedworkflow.css'));
+        Requirements::add_i18n_javascript('symbiote/silverstripe-advancedworkflow:client/lang');
+        Requirements::javascript('symbiote/silverstripe-advancedworkflow:client/dist/js/advancedworkflow.js');
+        Requirements::css('symbiote/silverstripe-advancedworkflow:client/dist/styles/advancedworkflow.css');
     }
 
     /*

diff --git a/code/extensions/AdvancedWorkflowExtension.php b/code/extensions/AdvancedWorkflowExtension.php
@@ -54,8 +54,7 @@ public function startworkflow($data, $form, $request)
      */
     public function updateEditForm(Form $form)
     {
-        $module = ModuleLoader::getModule('symbiote/silverstripe-advancedworkflow');
-        Requirements::javascript($module->getRelativeResourcePath('client/dist/js/advancedworkflow.js'));
+        Requirements::javascript('symbiote/silverstripe-advancedworkflow:client/dist/js/advancedworkflow.js');
         $svc    = singleton(WorkflowService::class);
         $p      = $form->getRecord();
         $active = $svc->getWorkflowFor($p);

diff --git a/code/extensions/WorkflowApplicable.php b/code/extensions/WorkflowApplicable.php
@@ -305,7 +305,7 @@ public function onAfterWrite()
     public function WorkflowInstances()
     {
         return WorkflowInstance::get()->filter(array(
-            'TargetClass' => $this->ownerBaseClass,
+            'TargetClass' => $this->owner->baseClass(),
             'TargetID'    => $this->owner->ID
         ));
     }

diff --git a/code/extensions/WorkflowEmbargoExpiryExtension.php b/code/extensions/WorkflowEmbargoExpiryExtension.php
@@ -93,23 +93,21 @@ public function updateCMSFields(FieldList $fields)
         // requirements
         // ------------
 
-        $module = ModuleLoader::getModule('symbiote/silverstripe-advancedworkflow');
-
-        Requirements::add_i18n_javascript($module->getRelativeResourcePath('client/lang'));
+        Requirements::add_i18n_javascript('symbiote/silverstripe-advancedworkflow:client/lang');
 
         // Add timepicker functionality
         // @see /~https://github.com/trentrichardson/jQuery-Timepicker-Addon
         Requirements::css(
-            $module->getRelativeResourcePath('thirdparty/javascript/jquery-ui/timepicker/jquery-ui-timepicker-addon.css')
+            'symbiote/silverstripe-advancedworkflow:thirdparty/javascript/jquery-ui/timepicker/jquery-ui-timepicker-addon.css'
         );
-        Requirements::css($module->getRelativeResourcePath('client/dist/styles/advancedworkflow.css'));
+        Requirements::css('symbiote/silverstripe-advancedworkflow:client/dist/styles/advancedworkflow.css');
         Requirements::javascript(
-            $module->getRelativeResourcePath('thirdparty/javascript/jquery-ui/timepicker/jquery-ui-sliderAccess.js')
+            'symbiote/silverstripe-advancedworkflow:thirdparty/javascript/jquery-ui/timepicker/jquery-ui-sliderAccess.js'
         );
         Requirements::javascript(
-            $module->getRelativeResourcePath('thirdparty/javascript/jquery-ui/timepicker/jquery-ui-timepicker-addon.js')
+            'symbiote/silverstripe-advancedworkflow:thirdparty/javascript/jquery-ui/timepicker/jquery-ui-timepicker-addon.js'
         );
-        Requirements::javascript($module->getRelativeResourcePath('client/dist/js/advancedworkflow.js'));
+        Requirements::javascript('symbiote/silverstripe-advancedworkflow:client/dist/js/advancedworkflow.js');
 
         // Fields
         // ------

diff --git a/code/formfields/WorkflowField.php b/code/formfields/WorkflowField.php
@@ -95,10 +95,8 @@ public function getTemplate()
 
     public function FieldHolder($properties = array())
     {
-        $workflow = ModuleLoader::getModule('symbiote/silverstripe-advancedworkflow');
-
-        Requirements::javascript($workflow->getRelativeResourcePath('client/dist/js/advancedworkflow.js'));
-        Requirements::css($workflow->getRelativeResourcePath('client/dist/styles/advancedworkflow.css'));
+        Requirements::javascript('symbiote/silverstripe-advancedworkflow:client/dist/js/advancedworkflow.js');
+        Requirements::css('symbiote/silverstripe-advancedworkflow:client/dist/styles/advancedworkflow.css');
 
         return $this->Field($properties);
     }

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "symbiote/silverstripe-advancedworkflow",
     "description": "Adds configurable workflow support to the CMS, with a GUI for creating custom workflow definitions.",
-    "type": "silverstripe-module",
+    "type": "silverstripe-vendormodule",
     "keywords": ["silverstripe", "advancedworkflow", "workflow"],
     "license": "BSD-3-Clause",
     "authors": [
@@ -26,10 +26,14 @@
         "squizlabs/php_codesniffer": "^3.0"
     },
     "extra": {
-        "installer-name": "advancedworkflow",
         "branch-alias": {
             "dev-master": "5.0.x-dev"
-        }
+        },
+        "expose": [
+            "client/dist",
+            "client/lang",
+            "images"
+        ]
     },
     "suggest": {
         "symbiote/silverstripe-queuedjobs": "Allow automated workflow transitions with queued system jobs"