Merge pull request #1174 from ec-europa/ISAICP-4415

Isaicp 4415: Allow moderators to edit the author of community content
ec-europa · May 18, 2018 · 80486b6 · 80486b6
2 parents 49bb825 + b9c77da
commit 80486b6
Show file tree

Hide file tree

Showing 8 changed files with 114 additions and 20 deletions.
diff --git a/tests/features/community_content/add_community_content.feature b/tests/features/community_content/add_community_content.feature
@@ -45,8 +45,8 @@ Feature: Add community content
     And I go to the homepage of the "The night shift" collection
     And I click "Add <content type>"
     Then I should see the heading "Add <content type>"
+    And the following fields should be present "Authored by"
     But I should not see the following lines of text:
-      | Authored by                  |
       | Authored on                  |
       | Create new revision          |
       | Generate automatic URL alias |

diff --git a/...tom/joinup_discussion/config/install/core.entity_form_display.node.discussion.default.yml b/...tom/joinup_discussion/config/install/core.entity_form_display.node.discussion.default.yml
@@ -39,7 +39,7 @@ content:
     region: content
   current_workflow_state:
     type: current_workflow_state_widget
-    weight: 7
+    weight: 8
     region: content
     settings:
       title: 'Current workflow state'
@@ -68,13 +68,13 @@ content:
     type: options_select
     region: content
   field_replies:
-    weight: 6
+    weight: 7
     settings: {  }
     third_party_settings: {  }
     type: comment_default
     region: content
   field_state:
-    weight: 8
+    weight: 9
     settings:
       use_transition_label: 1
     third_party_settings: {  }
@@ -96,7 +96,21 @@ content:
     third_party_settings: {  }
     region: content
   transition_motivation:
-    weight: 9
+    weight: 10
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  uid:
+    type: entity_reference_autocomplete
+    weight: 6
+    region: content
+    settings:
+      match_operator: CONTAINS
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  url_redirects:
+    weight: 11
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -111,4 +125,3 @@ hidden:
   promote: true
   status: true
   sticky: true
-  uid: true
diff --git a/.../custom/joinup_document/config/install/core.entity_form_display.node.document.default.yml b/.../custom/joinup_document/config/install/core.entity_form_display.node.document.default.yml
@@ -45,15 +45,15 @@ content:
     region: content
   current_workflow_state:
     type: current_workflow_state_widget
-    weight: 12
+    weight: 13
     region: content
     settings:
       title: 'Current workflow state'
       title_display: before
       show_for_new_entities: false
     third_party_settings: {  }
   field_comments:
-    weight: 10
+    weight: 11
     settings: {  }
     third_party_settings: {  }
     type: comment_default
@@ -114,7 +114,7 @@ content:
     region: content
   field_state:
     type: state_machine_buttons
-    weight: 13
+    weight: 14
     settings:
       use_transition_label: 1
     third_party_settings: {  }
@@ -134,7 +134,21 @@ content:
     third_party_settings: {  }
     region: content
   transition_motivation:
-    weight: 11
+    weight: 12
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  uid:
+    type: entity_reference_autocomplete
+    weight: 10
+    region: content
+    settings:
+      match_operator: CONTAINS
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  url_redirects:
+    weight: 15
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -150,4 +164,3 @@ hidden:
   promote: true
   status: true
   sticky: true
-  uid: true
diff --git a/...odules/custom/joinup_event/config/install/core.entity_form_display.node.event.default.yml b/...odules/custom/joinup_event/config/install/core.entity_form_display.node.event.default.yml
@@ -55,7 +55,7 @@ content:
     region: content
   current_workflow_state:
     type: current_workflow_state_widget
-    weight: 19
+    weight: 20
     region: content
     settings:
       title: 'Current workflow state'
@@ -70,7 +70,7 @@ content:
     type: file_generic
     region: content
   field_comments:
-    weight: 18
+    weight: 19
     settings: {  }
     third_party_settings: {  }
     type: comment_default
@@ -182,7 +182,7 @@ content:
     region: content
   field_state:
     type: state_machine_buttons
-    weight: 20
+    weight: 21
     region: content
     settings:
       use_transition_label: 1
@@ -200,6 +200,20 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
+  uid:
+    type: entity_reference_autocomplete
+    weight: 18
+    region: content
+    settings:
+      match_operator: CONTAINS
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  url_redirects:
+    weight: 22
+    region: content
+    settings: {  }
+    third_party_settings: {  }
 hidden:
   created: true
   field_shared_in: true
@@ -212,4 +226,3 @@ hidden:
   promote: true
   status: true
   sticky: true
-  uid: true
diff --git a/web/modules/custom/joinup_news/config/install/core.entity_form_display.node.news.default.yml b/web/modules/custom/joinup_news/config/install/core.entity_form_display.node.news.default.yml
@@ -44,7 +44,7 @@ content:
     region: content
   current_workflow_state:
     type: current_workflow_state_widget
-    weight: 12
+    weight: 13
     region: content
     settings:
       title: 'Current workflow state'
@@ -113,7 +113,7 @@ content:
     type: options_select
     region: content
   field_state:
-    weight: 13
+    weight: 14
     settings:
       use_transition_label: 1
     third_party_settings: {  }
@@ -135,8 +135,22 @@ content:
     third_party_settings: {  }
     region: content
   transition_motivation:
+    weight: 12
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  uid:
+    type: entity_reference_autocomplete
     weight: 11
     region: content
+    settings:
+      match_operator: CONTAINS
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  url_redirects:
+    weight: 15
+    region: content
     settings: {  }
     third_party_settings: {  }
 hidden:
@@ -150,4 +164,3 @@ hidden:
   promote: true
   status: true
   sticky: true
-  uid: true
diff --git a/...tom/joinup_newsletter/config/install/core.entity_form_display.node.newsletter.default.yml b/...tom/joinup_newsletter/config/install/core.entity_form_display.node.newsletter.default.yml
@@ -32,12 +32,26 @@ content:
     settings: {  }
     third_party_settings: {  }
     region: content
+  langcode:
+    type: language_select
+    weight: 2
+    region: content
+    settings:
+      include_locked: true
+    third_party_settings: {  }
   simplenews_issue:
     type: options_select
     weight: 1
     settings: {  }
     third_party_settings: {  }
     region: content
+  status:
+    type: boolean_checkbox
+    settings:
+      display_label: true
+    weight: 120
+    region: content
+    third_party_settings: {  }
   title:
     type: string_textfield
     weight: 0
@@ -55,6 +69,9 @@ content:
       placeholder: ''
     third_party_settings: {  }
     region: content
+  url_redirects:
+    weight: 50
+    region: content
 hidden:
   current_workflow_state: true
   og_audience: true

diff --git a/...odules/custom/joinup_video/config/install/core.entity_form_display.node.video.default.yml b/...odules/custom/joinup_video/config/install/core.entity_form_display.node.video.default.yml
@@ -32,7 +32,7 @@ content:
         hide_guidelines: '1'
     region: content
   field_comments:
-    weight: 5
+    weight: 6
     settings: {  }
     third_party_settings: {  }
     type: comment_default
@@ -60,6 +60,13 @@ content:
     third_party_settings: {  }
     type: entity_reference_autocomplete
     region: content
+  status:
+    type: boolean_checkbox
+    settings:
+      display_label: true
+    weight: 8
+    region: content
+    third_party_settings: {  }
   title:
     type: string_textfield
     weight: 0
@@ -68,6 +75,20 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  uid:
+    type: entity_reference_autocomplete
+    weight: 5
+    region: content
+    settings:
+      match_operator: CONTAINS
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  url_redirects:
+    weight: 7
+    region: content
+    settings: {  }
+    third_party_settings: {  }
 hidden:
   created: true
   current_workflow_state: true
@@ -76,4 +97,3 @@ hidden:
   path: true
   promote: true
   sticky: true
-  uid: true
diff --git a/web/profiles/joinup/joinup.profile b/web/profiles/joinup/joinup.profile
@@ -214,12 +214,17 @@ function joinup_inline_entity_form_reference_form_alter(&$reference_form, &$form
  * - Disable access to the comment settings. These are managed on collection
  *   level.
  * - Disable access to the meta information.
+ * - Allow access to the uid field only to the moderators.
  */
 function joinup_form_node_form_alter(&$form, FormStateInterface $form_state, $form_id) {
   $form['revision_information']['#access'] = FALSE;
   $form['revision']['#access'] = FALSE;
   $form['meta']['#access'] = FALSE;
 
+  if (isset($form['uid'])) {
+    $form['uid']['#access'] = \Drupal::currentUser()->hasPermission('administer nodes');
+  }
+
   foreach (['field_comments', 'field_replies'] as $field) {
     if (!empty($form[$field])) {
       $form[$field]['#access'] = FALSE;