Skip to content
This repository was archived by the owner on Apr 2, 2024. It is now read-only.

Merging develop into master #77

Merged
madsnorgaard merged 9 commits into from
Oct 1, 2021
Merged

Merging develop into master #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7aa912f
Add module uninstall logic to hook_install function.
Aug 16, 2021
c78cbaa
Restructure per best practices with install file.
Aug 17, 2021
6b1e8c1
Consolidate Forløbsside and webform content type.
Aug 17, 2021
6bbdab5
Rolling back to state of develop branch.
Aug 18, 2021
8eeea77
Fix typo.
Aug 31, 2021
45ca50d
Set proper versioning for os2forms_forloeb_profile
Sep 2, 2021
55b4389
Merge pull request #63 from OS2Forms/44229_consolidate_forloebsside_w…
madsnorgaard Sep 20, 2021
6b1fa4a
Refactor of forloebsdesigner and fix new role
Sep 29, 2021
fa1b954
Merge pull request #74 from OS2Forms/fix_selvbetjeningsdesigner_after…
madsnorgaard Sep 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"drupal/webform_scheduled_tasks": "^2.0",
"drupal/webform_views": "^5.0@alpha",
"drupal/workflow_participants": "^2.4",
"os2forms/os2forms_forloeb_profile": "dev-main",
"os2forms/os2forms_forloeb_profile": "^1.0",
"vlucas/phpdotenv": "^5.1",
"webmozart/path-util": "2.3.0",
"zaporylie/composer-drupal-optimizations": "1.2.0"
Expand Down
4 changes: 2 additions & 2 deletions config/install/switch_page_theme.settings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spt_table:
authenticated: authenticated
administrator: administrator
flow_designer: flow_designer
forloeb_designer: forloeb_designer
selvbetjeningsdesigner: selvbetjeningsdesigner
sagsbehandler: sagsbehandler
medarbejder: medarbejder
leder: leder
Expand All @@ -26,7 +26,7 @@ spt_table:
authenticated: authenticated
administrator: administrator
flow_designer: flow_designer
forloeb_designer: forloeb_designer
selvbetjeningsdesigner: selvbetjeningsdesigner
sagsbehandler: sagsbehandler
medarbejder: medarbejder
leder: leder
Expand Down
109 changes: 0 additions & 109 deletions config/optional/core.entity_form_display.node.forloebsside.default.yml
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions config/optional/core.entity_view_display.node.forloebsside.default.yml
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions config/optional/field.field.node.forloebsside.body.yml
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions config/optional/field.field.node.forloebsside.field_forloeb_webformular.yml
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions config/optional/field.storage.node.field_forloeb_webformular.yml
View file
Open in desktop

This file was deleted.

16 changes: 8 additions & 8 deletions ...ro_template.review_forloeb_page_basic.yml → ...ro_template.review_webform_page_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ dependencies:
enforced:
module:
- os2forms_forloeb
id: review_forloeb_page_basic
label: 'Review af Forløbsside simpel'
id: review_webform_page_basic
label: 'Review af Selvbetjeningsside simpel'
app_group: 0
canvas_height: 900
canvas_width: 800
Expand Down Expand Up @@ -78,8 +78,8 @@ tasks:
falsebranch: ''
lines: { }
data:
unique_id: forloebsside
content_type: forloebsside
unique_id: webform
content_type: webform
save_edit_later: 1
link_to_edit: 1
show_maestro_buttons_on_view: 0
Expand All @@ -89,7 +89,7 @@ tasks:
reject_redirect_to: ''
supply_maestro_ids_in_url: 0
redirect_to: taskconsole
handler: '/node/add/forloebsside?maestro=1'
handler: '/node/add/webform?maestro=1'
assigned: 'user:variable:initiator'
runonce: false
showindetail: true
Expand Down Expand Up @@ -121,8 +121,8 @@ tasks:
falsebranch: ''
lines: { }
data:
unique_id: forloebsside
content_type: forloebsside
unique_id: webform
content_type: webform
save_edit_later: 0
link_to_edit: 0
show_maestro_buttons_on_view: 1
Expand All @@ -132,7 +132,7 @@ tasks:
reject_redirect_to: /taskconsole
supply_maestro_ids_in_url: 0
redirect_to: taskconsole
handler: '/node/add/forloebsside?maestro=1'
handler: '/node/add/webform?maestro=1'
assigned: 'user:variable:assigned_to'
runonce: false
showindetail: true
Expand Down
Loading