Skip to content

Commit 2722c6c

Browse files
stephen-coxstephen-cox
authored
Merge pull request #52 from localgovdrupal/2.x
Release 2.0.2
2 parents f45c8ac + f92c6ea commit 2722c6c

File tree

2 files changed

+85
-4
lines changed

2 files changed

+85
-4
lines changed

‎.github/workflows/test.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
uses: actions/cache@v2
5151
with:
5252
path: ./html
53-
key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}
53+
key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }}
5454

5555
- name: Setup PHP
5656
uses: shivammathur/setup-php@v2
@@ -96,7 +96,7 @@ jobs:
9696
uses: actions/cache@v2
9797
with:
9898
path: ./html
99-
key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}
99+
key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }}
100100
restore-keys: |
101101
localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-
102102
@@ -129,7 +129,7 @@ jobs:
129129
uses: actions/cache@v2
130130
with:
131131
path: ./html
132-
key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}
132+
key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }}
133133
restore-keys: |
134134
localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-
135135
@@ -168,7 +168,7 @@ jobs:
168168
uses: actions/cache@v2
169169
with:
170170
path: ./html
171-
key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}
171+
key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }}
172172
restore-keys: |
173173
localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-
174174

‎localgov_subsites.module

+81
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* LocalGov Subsites module file.
66
*/
77

8+
use Drupal\localgov_roles\RolesHelper;
89
use Drupal\localgov_subsites\Subsite;
910
use Drupal\node\NodeInterface;
1011

@@ -41,6 +42,86 @@ function localgov_subsites_theme($existing, $type, $theme, $path) {
4142
];
4243
}
4344

45+
/**
46+
* Implements hook_localgov_role_default().
47+
*/
48+
function localgov_subsites_localgov_roles_default() {
49+
50+
// Content editing permissions.
51+
$perms = [
52+
RolesHelper::EDITOR_ROLE => [
53+
'create localgov_subsites_overview content',
54+
'create localgov_subsites_page content',
55+
'delete any localgov_subsites_overview content',
56+
'delete any localgov_subsites_page content',
57+
'delete localgov_subsites_overview revisions',
58+
'delete localgov_subsites_page revisions',
59+
'delete own localgov_subsites_overview content',
60+
'delete own localgov_subsites_page content',
61+
'edit any localgov_subsites_overview content',
62+
'edit any localgov_subsites_page content',
63+
'edit own localgov_subsites_overview content',
64+
'edit own localgov_subsites_page content',
65+
'revert localgov_subsites_overview revisions',
66+
'revert localgov_subsites_page revisions',
67+
'view localgov_subsites_overview revisions',
68+
'view localgov_subsites_page revisions',
69+
],
70+
RolesHelper::AUTHOR_ROLE => [
71+
'create localgov_subsites_overview content',
72+
'create localgov_subsites_page content',
73+
'delete own localgov_subsites_overview content',
74+
'delete own localgov_subsites_page content',
75+
'edit own localgov_subsites_overview content',
76+
'edit own localgov_subsites_page content',
77+
'revert localgov_subsites_overview revisions',
78+
'revert localgov_subsites_page revisions',
79+
'view localgov_subsites_overview revisions',
80+
'view localgov_subsites_page revisions',
81+
],
82+
RolesHelper::CONTRIBUTOR_ROLE => [
83+
'create localgov_subsites_overview content',
84+
'create localgov_subsites_page content',
85+
'delete own localgov_subsites_overview content',
86+
'delete own localgov_subsites_page content',
87+
'edit own localgov_subsites_overview content',
88+
'edit own localgov_subsites_page content',
89+
'view localgov_subsites_overview revisions',
90+
'view localgov_subsites_page revisions',
91+
],
92+
];
93+
94+
// Content scheduling permissions required by localgov_workflows.
95+
if (\Drupal::moduleHandler()->moduleExists('localgov_workflows')) {
96+
$perms[RolesHelper::EDITOR_ROLE] = array_merge($perms[RolesHelper::EDITOR_ROLE], [
97+
'add scheduled transitions node localgov_subsites_overview',
98+
'add scheduled transitions node localgov_subsites_page',
99+
'reschedule scheduled transitions node localgov_subsites_overview',
100+
'reschedule scheduled transitions node localgov_subsites_page',
101+
'view scheduled transitions node localgov_subsites_overview',
102+
'view scheduled transitions node localgov_subsites_page',
103+
]);
104+
$perms[RolesHelper::AUTHOR_ROLE] = array_merge($perms[RolesHelper::AUTHOR_ROLE], [
105+
'add scheduled transitions node localgov_subsites_overview',
106+
'add scheduled transitions node localgov_subsites_page',
107+
'reschedule scheduled transitions node localgov_subsites_overview',
108+
'reschedule scheduled transitions node localgov_subsites_page',
109+
'view scheduled transitions node localgov_subsites_overview',
110+
'view scheduled transitions node localgov_subsites_page',
111+
]);
112+
$perms[RolesHelper::CONTRIBUTOR_ROLE] = array_merge($perms[RolesHelper::CONTRIBUTOR_ROLE], [
113+
'add scheduled transitions node localgov_subsites_overview',
114+
'add scheduled transitions node localgov_subsites_page',
115+
'reschedule scheduled transitions node localgov_subsites_overview',
116+
'reschedule scheduled transitions node localgov_subsites_page',
117+
'view scheduled transitions node localgov_subsites_overview',
118+
'view scheduled transitions node localgov_subsites_page',
119+
]);
120+
}
121+
122+
return $perms;
123+
}
124+
44125
/**
45126
* Implements hook_preprocess_page().
46127
*

0 commit comments

Comments
 (0)