Merge pull request #6 from drishu/master

nodeque fix
ec-europa · Aug 10, 2018 · caab452 · caab452
2 parents 9d7371e + 1fac937
commit caab452
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/lib/features/nems_core/nems_core.module b/lib/features/nems_core/nems_core.module
@@ -635,10 +635,12 @@ function _nems_core_user_access($permissions, $account = NULL) {
  */
 function nems_core_preprocess_feature_set_admin_form(&$variables) {
   // Add specific javascript.
-  drupal_add_js(drupal_get_path('theme', 'ec_resp') . '/scripts/feature-set.js', array(
-    'scope' => 'footer',
-    'weight' => 13,
-  ));
+  if (file_exists(drupal_get_path('theme', 'ec_resp') . '/scripts/feature-set.js')) {
+    drupal_add_js(drupal_get_path('theme', 'ec_resp') . '/scripts/feature-set.js', array(
+      'scope' => 'footer',
+      'weight' => 13,
+    ));
+  }
 
   $categories_list = '';
   $features_list = '';

diff --git a/resources/install-nems-platform.sh b/resources/install-nems-platform.sh
@@ -21,6 +21,10 @@ if [ -d "vendor/ec-europa/ec-nems-platform" ] ; then
   #cp -r vendor/ec-europa/ec-nems-platform/lib/themes/* themes/nems
   cp -f vendor/ec-europa/ec-nems-platform/resources/nems-platform.make ../../../resources/nems-platform.make
 
+  # Create the patches folder.
+  mkdir -p ../../../resources/patches
+  cp -f vendor/ec-europa/ec-nems-platform/resources/patches/* ../../../resources/patches
+
   # Include the nems-platform.make file.
   if ! [ -e $MAKE ] 2> /dev/null && [ -e $MAKE".example" ] ; then
     mv $MAKE".example" $MAKE;

diff --git a/resources/nems-platform.make b/resources/nems-platform.make
@@ -32,6 +32,7 @@ projects[eva][version] = "1.3"
 
 projects[features_extra][subdir] = "contrib/nems"
 projects[features_extra][version] = "1.0"
+projects[features_extra][patch][] = patches/features_extra-fe_nodequeue_fix_object_use_as_array.patch
 
 projects[features_roles_permissions][subdir] = "contrib/nems"
 projects[features_roles_permissions][version] = "1.2"

diff --git a/resources/patches/features_extra-fe_nodequeue_fix_object_use_as_array.patch b/resources/patches/features_extra-fe_nodequeue_fix_object_use_as_array.patch
@@ -0,0 +1,17 @@
+diff --git a/fe_nodequeue.module b/fe_nodequeue.module
+index 0fa6afd..9b86f8d 100644
+--- a/fe_nodequeue.module
++++ b/fe_nodequeue.module
+@@ -133,6 +133,12 @@ function fe_nodequeue_features_revert($module) {
+
+   // Revert.
+   foreach ($defaults as $object) {
++
++    // Fix the bug "Cannot use object of type stdclass as array".
++    if ((isset($object)) && (is_object($object))) {
++      $object = (array)$object;
++    }
++
+     if (empty($object['name'])) {
+       continue;
+     }