Merge pull request #209 from dof-dss/development

Origins modules release v1.1.5
dof-dss · Jun 9, 2022 · 8893e41 · 8893e41
2 parents 81387ef + dd067c7
commit 8893e41
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,13 +1,13 @@
 # PHP CircleCI 2.0 configuration file
 #
 # Check https://circleci.com/docs/2.0/language-php/ for more details
-version: 2
+version: 2.1
 
 jobs:
   # Test that coding standards fit drupal.org definitions.
   coding_standards:
     docker:
-      - image: circleci/php:7.4.15-apache-browsers
+      - image: circleci/php:8.0-apache-browsers
     steps:
       - checkout
       - run:
@@ -28,7 +28,7 @@ jobs:
 
   deprecated_code:
     docker:
-      - image: circleci/php:7.4.15-apache-browsers
+      - image: circleci/php:8.0-apache-browsers
     steps:
       - checkout:
           path: /home/circleci/origins_modules
@@ -43,12 +43,12 @@ jobs:
           name: Fetch latest Drupal version
           command: |
             cd /home/circleci
-            composer create-project drupal-composer/drupal-project:8.x-dev /home/circleci/project --no-interaction
+            composer create-project drupal-composer/drupal-project:9.x-dev /home/circleci/project --no-interaction
       - run:
           name: Download dependent contrib modules.
           command: |
             cd /home/circleci/project
-            composer require drupal/entity_embed mglaman/drupal-check --no-interaction
+            composer require drupal/entity_embed mglaman/drupal-check:1.3.0 composer/xdebug-handler:2.0.1 --no-interaction
       - run:
           name: Move custom code into position
           command: mv /home/circleci/origins_modules /home/circleci/project/web/modules/origins

diff --git a/origins_workflow/origins_workflow.module b/origins_workflow/origins_workflow.module
@@ -688,6 +688,9 @@ function origins_workflow_moderation_sidebar_alter(array &$build, EntityInterfac
       }
     }
   }
+  else {
+    hide($build['actions']['secondary']['entityqueue.entities:entity.node.entityqueue']);
+  }
 }
 
 /**
-Original file line number
+Diff line change
@@ Expand Up @@
           }
         }
       }
+      else {
+        hide($build['actions']['secondary']['entityqueue.entities:entity.node.entityqueue']);
+      }
     }
     /**
@@ Expand Down @@