Merge commit '94946d192be8ef296489ff7a7e99dc8725ec2efd' into 2.x

SU-SWS · Jan 6, 2025 · 68660fb · 68660fb
2 parents 471553e + 94946d1
commit 68660fb
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 16 deletions.
diff --git a/docroot/profiles/lagunita/summer_profile/config/sync/core.extension.yml b/docroot/profiles/lagunita/summer_profile/config/sync/core.extension.yml
@@ -9,7 +9,6 @@ module:
   basic_auth: 0
   block: 0
   block_content: 0
-  block_content_permissions: 0
   book: 0
   breakpoint: 0
   change_labels: 0

diff --git a/docroot/profiles/lagunita/summer_profile/config/sync/user.role.site_builder.yml b/docroot/profiles/lagunita/summer_profile/config/sync/user.role.site_builder.yml
@@ -37,7 +37,6 @@ dependencies:
   module:
     - block
     - block_content
-    - block_content_permissions
     - book
     - config_pages
     - content_lock
@@ -317,7 +316,6 @@ permissions:
   - 'select account cancellation method'
   - 'switch shortcut sets'
   - 'update any media'
-  - 'update any stanford_component_block block content'
   - 'update media'
   - 'use text format stanford_html'
   - 'use text format stanford_minimal_html'

diff --git a/docroot/profiles/lagunita/summer_profile/config/sync/user.role.site_developer.yml b/docroot/profiles/lagunita/summer_profile/config/sync/user.role.site_developer.yml
@@ -38,7 +38,6 @@ dependencies:
     - auto_entitylabel
     - block
     - block_content
-    - block_content_permissions
     - book
     - config_pages
     - content_lock
@@ -361,7 +360,6 @@ permissions:
   - 'select account cancellation method'
   - 'switch shortcut sets'
   - 'update any media'
-  - 'update any stanford_component_block block content'
   - 'update media'
   - 'use text format stanford_html'
   - 'use text format stanford_minimal_html'

diff --git a/docroot/profiles/lagunita/summer_profile/config/sync/user.role.site_manager.yml b/docroot/profiles/lagunita/summer_profile/config/sync/user.role.site_manager.yml
@@ -3,6 +3,7 @@ langcode: en
 status: true
 dependencies:
   config:
+    - block_content.type.stanford_component_block
     - filter.format.stanford_html
     - filter.format.stanford_minimal_html
     - media.type.embeddable
@@ -28,7 +29,7 @@ dependencies:
     - taxonomy.vocabulary.stanford_publication_topics
     - taxonomy.vocabulary.su_shared_tags
   module:
-    - block_content_permissions
+    - block_content
     - book
     - config_pages
     - content_lock
@@ -176,6 +177,7 @@ permissions:
   - 'edit any file media'
   - 'edit any google_form media'
   - 'edit any image media'
+  - 'edit any stanford_component_block block content'
   - 'edit any stanford_course content'
   - 'edit any stanford_event content'
   - 'edit any stanford_event_series content'
@@ -240,7 +242,6 @@ permissions:
   - 'revert stanford_publication revisions'
   - 'schedule publishing of nodes'
   - 'update any media'
-  - 'update any stanford_component_block block content'
   - 'update media'
   - 'use text format stanford_html'
   - 'use text format stanford_minimal_html'

diff --git a/docroot/profiles/lagunita/summer_profile/config/sync/views.view.su_block_edit_links.yml b/docroot/profiles/lagunita/summer_profile/config/sync/views.view.su_block_edit_links.yml
@@ -92,7 +92,7 @@ display:
       access:
         type: perm
         options:
-          perm: 'update any stanford_component_block block content'
+          perm: 'edit any stanford_component_block block content'
       cache:
         type: tag
         options: {  }

diff --git a/...rofiles/lagunita/summer_profile/tests/codeception/acceptance/Content/PublicationsCest.php b/...rofiles/lagunita/summer_profile/tests/codeception/acceptance/Content/PublicationsCest.php
@@ -46,7 +46,7 @@ public function testBookCitation(AcceptanceTester $I) {
     $I->fillField('Title', $this->values['node_title']);
     $I->selectOption('Publication Types (value 1)', $term->id());
     $I->selectOption('su_publication_citation[actions][bundle]', 'Book');
-    $I->click('Add new Citation');
+    $I->click('Add Citation');
     $I->fillField('First Name', $this->faker->firstName);
     $I->fillField('Last Name/Company', $this->faker->lastName);
     $I->fillField('Subtitle', $this->faker->text);
@@ -106,7 +106,7 @@ public function testOtherPublication(AcceptanceTester $I) {
     $I->amOnPage('/node/add/stanford_publication');
     $I->fillField('Title', $this->values['node_title']);
     $I->selectOption('su_publication_citation[actions][bundle]', 'Other');
-    $I->click('Add new Citation');
+    $I->click('Add Citation');
     $I->fillField('First Name', $this->faker->firstName);
     $I->fillField('Last Name/Company', $this->faker->lastName);
     $I->fillField('Subtitle', $this->faker->text);
@@ -132,7 +132,7 @@ public function testListSort(AcceptanceTester $I) {
     $I->amOnPage('/node/add/stanford_publication');
     $I->fillField('Title', $this->values['a_node_title']);
     $I->selectOption('su_publication_citation[actions][bundle]', 'Other');
-    $I->click('Add new Citation');
+    $I->click('Add Citation');
     $I->fillField('Year', 2020);
     $I->fillField('Month', 6);
     $I->fillField('Day', 1);
@@ -142,7 +142,7 @@ public function testListSort(AcceptanceTester $I) {
     $I->amOnPage('/node/add/stanford_publication');
     $I->fillField('Title', $this->values['b_node_title']);
     $I->selectOption('su_publication_citation[actions][bundle]', 'Other');
-    $I->click('Add new Citation');
+    $I->click('Add Citation');
     $I->fillField('Year', 2020);
     $I->fillField('Month', 6);
     $I->fillField('Day', 15);
@@ -152,7 +152,7 @@ public function testListSort(AcceptanceTester $I) {
     $I->amOnPage('/node/add/stanford_publication');
     $I->fillField('Title', $this->values['c_node_title']);
     $I->selectOption('su_publication_citation[actions][bundle]', 'Other');
-    $I->click('Add new Citation');
+    $I->click('Add Citation');
     $I->fillField('Year', 2020);
     $I->fillField('Month', 1);
     $I->fillField('Day', 15);
@@ -203,7 +203,7 @@ public function testPubAuthorPage(AcceptanceTester $I) {
     $I->logInWithRole('contributor');
     $I->amOnPage($publication->toUrl('edit-form')->toString());
     $I->selectOption('su_publication_citation[actions][bundle]', 'Book');
-    $I->click('Add new Citation');
+    $I->click('Add Citation');
     $I->fillField('First Name', $first_name);
     $I->fillField('Last Name/Company', $last_name);
     $I->fillField('Subtitle', $this->faker->words(2, TRUE));
@@ -231,7 +231,7 @@ public function testJournalPublisher(AcceptanceTester $I) {
     $I->fillField('Title', $this->values['node_title']);
     $I->selectOption('Publication Types (value 1)', $term->id());
     $I->selectOption('su_publication_citation[actions][bundle]', 'Journal Article');
-    $I->click('Add new Citation');
+    $I->click('Add Citation');
     $I->fillField('First Name', $this->faker->firstName);
     $I->fillField('Last Name/Company', $this->faker->lastName);
     $I->fillField('Volume', "1");

diff --git a/...s/lagunita/summer_profile/tests/codeception/functional/Paragraphs/EntityReferenceCest.php b/...s/lagunita/summer_profile/tests/codeception/functional/Paragraphs/EntityReferenceCest.php
@@ -67,7 +67,7 @@ protected function testPublicationTeasers(FunctionalTester $I) {
     $I->amOnPage($publication->toUrl('edit-form')->toString());
 
     $I->selectOption('su_publication_citation[actions][bundle]', 'Journal Article');
-    $I->click('Add new Citation');
+    $I->click('Add Citation');
     $I->waitForText('First Name');
     $I->click('Save');
     $I->canSee($publication->label(), 'h1');