Skip to content

Commit

Permalink
HPC-9281: Revamp of content access control. Add content space field t…
Browse files Browse the repository at this point in the history
…o articles and documents (and import them from CM), add content spaces field to teams, tigh them together via node grants, also features some nice UI additions and even more restricted permissions. Extends the team page, limits data show on the team overview page and adds subpages with complete lists, UI still to be defined/improved but usable for the moment
  • Loading branch information
berliner committed Mar 15, 2024
1 parent edfff82 commit 57c1eed
Show file tree
Hide file tree
Showing 76 changed files with 6,152 additions and 508 deletions.
2 changes: 2 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
"drupal/editor_advanced_link": "^2.2",
"drupal/entity_access_password": "^1.0",
"drupal/field_group": "^3.1",
"drupal/flat_taxonomy": "^2.0",
"drupal/fpa": "^4.0.0",
"drupal/gin": "^3.0-beta5",
"drupal/gin_lb": "^1.0@beta",
Expand Down Expand Up @@ -116,6 +117,7 @@
"drupal/smugmug_api": "^2.0",
"drupal/social_auth_hid": "^3.2",
"drupal/stage_file_proxy": "^2.0",
"drupal/subpathauto": "^1.3",
"drupal/tippy": "^1.0",
"drupal/username_enumeration_prevention": "^1.3",
"drupal/view_unpublished": "^1.0",
Expand Down
102 changes: 101 additions & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion composer.patches.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@
"drupal/autologout": {
"Issue #3214958: Autologout triggered in background tab, no indication in other open tabs": "https://git.drupalcode.org/project/autologout/-/merge_requests/6.diff"
},
"drupal/flat_taxonomy": {
"Issue #3427628: Hide 'Add child' link from entity operations": "https://www.drupal.org/files/issues/2024-03-13/3427628-hide-add-child-link-2.patch"
},
"drupal/gin": {
"Issue #??: Use toolbar-bar as id for the toolbar to prevent JS errors in Drupal 10.2": "./patches/gin-toolbar-id.patch"
"Issue #??: Use toolbar-bar as id for the toolbar to prevent JS errors in Drupal 10.2": "./patches/gin-toolbar-id.patch",
"Issue #3281984: The breadcrumb shows 'Edit <label>' on all entity routes, even canonical/delete routes": "https://www.drupal.org/files/issues/2024-02-07/gin_3281984_cherrypick_for_rc9.patch"
},
"drupal/gin_lb": {
"Issue #??: Add alter hook for template suggestions trigger": "./patches/hook_gin_lb_add_suggestions_alter-1.0.0-rc6.patch"
Expand Down
32 changes: 15 additions & 17 deletions config/core.entity_form_display.node.article.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ status: true
dependencies:
config:
- field.field.node.article.field_base_objects
- field.field.node.article.field_content_space
- field.field.node.article.field_display_hero_image
- field.field.node.article.field_image
- field.field.node.article.field_inherit_section_image
Expand All @@ -12,7 +13,6 @@ dependencies:
- field.field.node.article.field_short_title
- field.field.node.article.field_summary
- field.field.node.article.field_tags
- field.field.node.article.field_team
- field.field.node.article.layout_builder__layout
- image.style.thumbnail
- node.type.article
Expand Down Expand Up @@ -60,6 +60,7 @@ third_party_settings:
group_remote_article:
children:
- field_remote_article
- field_content_space
- field_image
- field_summary
- field_tags
Expand All @@ -80,7 +81,6 @@ third_party_settings:
- image_crop
- field_display_hero_image
- field_inherit_section_image
- field_team
label: Display
region: content
parent_name: group_tabs
Expand Down Expand Up @@ -117,6 +117,16 @@ content:
disable_drag_and_drop: 0
wrapper: 0
third_party_settings: { }
field_content_space:
type: entity_reference_autocomplete
weight: 11
region: content
settings:
match_operator: CONTAINS
match_limit: 10
size: 60
placeholder: ''
third_party_settings: { }
field_display_hero_image:
type: boolean_checkbox
weight: 30
Expand All @@ -126,7 +136,7 @@ content:
third_party_settings: { }
field_image:
type: image_image
weight: 11
weight: 12
region: content
settings:
progress_indicator: throbber
Expand All @@ -141,7 +151,7 @@ content:
third_party_settings: { }
field_protected:
type: entity_access_password_password
weight: 52
weight: 12
region: content
settings:
open: false
Expand Down Expand Up @@ -186,19 +196,6 @@ content:
region: content
settings: { }
third_party_settings: { }
field_team:
type: options_select
weight: 30
region: content
settings: { }
third_party_settings: { }
langcode:
type: language_select
weight: 2
region: content
settings:
include_locked: true
third_party_settings: { }
path:
type: path
weight: 9
Expand Down Expand Up @@ -255,4 +252,5 @@ content:
settings: { }
third_party_settings: { }
hidden:
langcode: true
layout_builder__layout: true
Loading

0 comments on commit 57c1eed

Please sign in to comment.