diff --git a/web/modules/custom/portland/portland.links.menu.yml b/web/modules/custom/portland/portland.links.menu.yml index ddcd29a25e..563df8dec3 100644 --- a/web/modules/custom/portland/portland.links.menu.yml +++ b/web/modules/custom/portland/portland.links.menu.yml @@ -10,6 +10,12 @@ portland.logout: route_name: user.logout weight: 60 menu_name: editor-toolbar +portland.council_toolbar.committees: + title: 'Committees' + description: 'Edit council committees' + url: "internal:/admin/structure/taxonomy/manage/council_committee/overview" + menu_name: council-toolbar + weight: 40 portland.policy_toolbar.policy_categories: title: 'Policy Categories' description: 'Edit policy categories' diff --git a/web/sites/default/config/bulk_user_registration.settings.yml b/web/sites/default/config/bulk_user_registration.settings.yml index 795f34140c..a4ef16beee 100644 --- a/web/sites/default/config/bulk_user_registration.settings.yml +++ b/web/sites/default/config/bulk_user_registration.settings.yml @@ -5,7 +5,6 @@ allowed_roles: publisher: publisher policy_author: policy_author policy_editor: policy_editor - attorney: attorney council_author: council_author council_clerk: council_clerk budget: budget diff --git a/web/sites/default/config/core.entity_form_display.node.council_document.default.yml b/web/sites/default/config/core.entity_form_display.node.council_document.default.yml index 407c1656f8..473f2b6db8 100644 --- a/web/sites/default/config/core.entity_form_display.node.council_document.default.yml +++ b/web/sites/default/config/core.entity_form_display.node.council_document.default.yml @@ -36,7 +36,6 @@ dependencies: - field.field.node.council_document.field_purpose_and_background - field.field.node.council_document.field_requested_council_date - field.field.node.council_document.field_requested_start_time - - field.field.node.council_document.field_reviewed_by_city_attorney - field.field.node.council_document.field_reviewer - field.field.node.council_document.field_substituted_by_council - field.field.node.council_document.field_time_requested @@ -414,11 +413,12 @@ content: dependee: field_council_document_type settings: state: visible + reset: false condition: value grouping: OR values_set: 3 value: '' - values: "72\r\n73" + values: '73' value_form: - target_id: '73' @@ -514,11 +514,12 @@ content: dependee: field_council_document_type settings: state: visible + reset: false condition: value grouping: OR values_set: 3 value: '' - values: "72\r\n73\r\n74" + values: '73' value_form: { } effect: show effect_options: { } @@ -526,7 +527,7 @@ content: form_mode: default field_neighborhood: type: select2_entity_reference - weight: 10 + weight: 11 region: content settings: width: 100% @@ -716,7 +717,6 @@ content: hidden: field_date_prepared: true field_redirects: true - field_reviewed_by_city_attorney: true group_content: true langcode: true promote: true diff --git a/web/sites/default/config/core.entity_form_display.taxonomy_term.council_committee.default.yml b/web/sites/default/config/core.entity_form_display.taxonomy_term.council_committee.default.yml index 6c1b1673b3..6413e1eab6 100644 --- a/web/sites/default/config/core.entity_form_display.taxonomy_term.council_committee.default.yml +++ b/web/sites/default/config/core.entity_form_display.taxonomy_term.council_committee.default.yml @@ -5,7 +5,6 @@ dependencies: config: - field.field.taxonomy_term.council_committee.field_chair - field.field.taxonomy_term.council_committee.field_committee_members - - field.field.taxonomy_term.council_committee.field_prefix - field.field.taxonomy_term.council_committee.field_vice_chair - taxonomy.vocabulary.council_committee module: @@ -44,14 +43,6 @@ content: size: 60 placeholder: '' third_party_settings: { } - field_prefix: - type: string_textfield - weight: 2 - region: content - settings: - size: 60 - placeholder: '' - third_party_settings: { } field_vice_chair: type: entity_reference_autocomplete weight: 4 diff --git a/web/sites/default/config/core.entity_view_display.node.council_document.default.yml b/web/sites/default/config/core.entity_view_display.node.council_document.default.yml index 51469725e7..e12c91ad80 100644 --- a/web/sites/default/config/core.entity_view_display.node.council_document.default.yml +++ b/web/sites/default/config/core.entity_view_display.node.council_document.default.yml @@ -36,7 +36,6 @@ dependencies: - field.field.node.council_document.field_purpose_and_background - field.field.node.council_document.field_requested_council_date - field.field.node.council_document.field_requested_start_time - - field.field.node.council_document.field_reviewed_by_city_attorney - field.field.node.council_document.field_reviewer - field.field.node.council_document.field_substituted_by_council - field.field.node.council_document.field_time_requested @@ -311,7 +310,6 @@ hidden: field_is_amends_budget: true field_needs_attorney_review: true field_neighborhood: true - field_reviewed_by_city_attorney: true field_reviewer: true group_content: true langcode: true diff --git a/web/sites/default/config/core.entity_view_display.node.council_document.embedded.yml b/web/sites/default/config/core.entity_view_display.node.council_document.embedded.yml index 1e73b88273..106662879b 100644 --- a/web/sites/default/config/core.entity_view_display.node.council_document.embedded.yml +++ b/web/sites/default/config/core.entity_view_display.node.council_document.embedded.yml @@ -37,7 +37,6 @@ dependencies: - field.field.node.council_document.field_purpose_and_background - field.field.node.council_document.field_requested_council_date - field.field.node.council_document.field_requested_start_time - - field.field.node.council_document.field_reviewed_by_city_attorney - field.field.node.council_document.field_reviewer - field.field.node.council_document.field_substituted_by_council - field.field.node.council_document.field_time_requested @@ -153,7 +152,6 @@ hidden: field_purpose_and_background: true field_requested_council_date: true field_requested_start_time: true - field_reviewed_by_city_attorney: true field_reviewer: true field_substituted_by_council: true field_time_requested: true diff --git a/web/sites/default/config/core.entity_view_display.node.council_document.search_result.yml b/web/sites/default/config/core.entity_view_display.node.council_document.search_result.yml index 605fe76890..4eab8a6770 100644 --- a/web/sites/default/config/core.entity_view_display.node.council_document.search_result.yml +++ b/web/sites/default/config/core.entity_view_display.node.council_document.search_result.yml @@ -37,7 +37,6 @@ dependencies: - field.field.node.council_document.field_purpose_and_background - field.field.node.council_document.field_requested_council_date - field.field.node.council_document.field_requested_start_time - - field.field.node.council_document.field_reviewed_by_city_attorney - field.field.node.council_document.field_reviewer - field.field.node.council_document.field_substituted_by_council - field.field.node.council_document.field_time_requested @@ -152,7 +151,6 @@ hidden: field_purpose_and_background: true field_requested_council_date: true field_requested_start_time: true - field_reviewed_by_city_attorney: true field_reviewer: true field_substituted_by_council: true field_time_requested: true diff --git a/web/sites/default/config/core.entity_view_display.node.council_document.teaser.yml b/web/sites/default/config/core.entity_view_display.node.council_document.teaser.yml index 3261c5fc1b..fd7bb4826a 100644 --- a/web/sites/default/config/core.entity_view_display.node.council_document.teaser.yml +++ b/web/sites/default/config/core.entity_view_display.node.council_document.teaser.yml @@ -37,7 +37,6 @@ dependencies: - field.field.node.council_document.field_purpose_and_background - field.field.node.council_document.field_requested_council_date - field.field.node.council_document.field_requested_start_time - - field.field.node.council_document.field_reviewed_by_city_attorney - field.field.node.council_document.field_reviewer - field.field.node.council_document.field_substituted_by_council - field.field.node.council_document.field_time_requested @@ -125,7 +124,6 @@ hidden: field_purpose_and_background: true field_requested_council_date: true field_requested_start_time: true - field_reviewed_by_city_attorney: true field_reviewer: true field_substituted_by_council: true field_time_requested: true diff --git a/web/sites/default/config/core.entity_view_display.taxonomy_term.council_committee.default.yml b/web/sites/default/config/core.entity_view_display.taxonomy_term.council_committee.default.yml index f09cab402c..aebef9aa03 100644 --- a/web/sites/default/config/core.entity_view_display.taxonomy_term.council_committee.default.yml +++ b/web/sites/default/config/core.entity_view_display.taxonomy_term.council_committee.default.yml @@ -5,7 +5,6 @@ dependencies: config: - field.field.taxonomy_term.council_committee.field_chair - field.field.taxonomy_term.council_committee.field_committee_members - - field.field.taxonomy_term.council_committee.field_prefix - field.field.taxonomy_term.council_committee.field_vice_chair - taxonomy.vocabulary.council_committee - views.view.council_documents @@ -162,6 +161,5 @@ content: weight: 3 region: content hidden: - field_prefix: true langcode: true search_api_excerpt: true diff --git a/web/sites/default/config/diff.plugins.yml b/web/sites/default/config/diff.plugins.yml index ede5734f74..3851fd4a91 100644 --- a/web/sites/default/config/diff.plugins.yml +++ b/web/sites/default/config/diff.plugins.yml @@ -1126,9 +1126,6 @@ fields: show_header: 1 markdown: drupal_html_to_text compare_entity_reference: 1 - field_reviewed_by_city_attorney: - type: hidden - settings: { } field_reviewer: type: entity_reference_field_diff_builder settings: diff --git a/web/sites/default/config/field.field.node.council_document.field_reviewed_by_city_attorney.yml b/web/sites/default/config/field.field.node.council_document.field_reviewed_by_city_attorney.yml deleted file mode 100644 index af41484fe1..0000000000 --- a/web/sites/default/config/field.field.node.council_document.field_reviewed_by_city_attorney.yml +++ /dev/null @@ -1,31 +0,0 @@ -uuid: 5f547782-c139-4f1b-830d-d3e3863d4654 -langcode: en -status: true -dependencies: - config: - - field.storage.node.field_reviewed_by_city_attorney - - node.type.council_document - module: - - custom_add_another -third_party_settings: - custom_add_another: - custom_add_another: '' - custom_remove: '' -id: node.council_document.field_reviewed_by_city_attorney -field_name: field_reviewed_by_city_attorney -entity_type: node -bundle: council_document -label: 'Reviewed by City Attorney' -description: "Who reviewed this document from the city attorney's office?" -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: - handler: views - handler_settings: - view: - view_name: attorneys - display_name: entity_reference_1 - arguments: { } -field_type: entity_reference diff --git a/web/sites/default/config/field.field.node.council_document.field_reviewer.yml b/web/sites/default/config/field.field.node.council_document.field_reviewer.yml index 711c08dcb5..a3c8877396 100644 --- a/web/sites/default/config/field.field.node.council_document.field_reviewer.yml +++ b/web/sites/default/config/field.field.node.council_document.field_reviewer.yml @@ -18,7 +18,7 @@ field_name: field_reviewer entity_type: node bundle: council_document label: Reviewer -description: "

Add one or more reviewers to move the Council document through the following review states.

\r\n\r\n

The filing deadline for Elected Offices is 12:00 p.m. on Tuesday for the following week’s meetings. The Council Clerk’s Office will review Council documents set to Council Clerk review and note changes or questions in the revision log, then place the item in the Ready for Agenda state when finalized.

" +description: "

Add one or more reviewers to move the Council document through the following review states.

\r\n\r\n

The filing deadline for Elected Offices is 12:00 p.m. on Tuesday for the following week’s meetings. The Council Clerk’s Office will review Council documents set to Council Clerk review and note changes or questions in the revision log, then place the item in the Ready for Agenda state when finalized.

" required: false translatable: false default_value: { } diff --git a/web/sites/default/config/field.field.taxonomy_term.council_committee.field_prefix.yml b/web/sites/default/config/field.field.taxonomy_term.council_committee.field_prefix.yml deleted file mode 100644 index a11dd8d654..0000000000 --- a/web/sites/default/config/field.field.taxonomy_term.council_committee.field_prefix.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: abc08e22-0023-408f-b18a-1f5bfdd41750 -langcode: en -status: true -dependencies: - config: - - field.storage.taxonomy_term.field_prefix - - taxonomy.vocabulary.council_committee - module: - - tmgmt_content -third_party_settings: - tmgmt_content: - excluded: false -id: taxonomy_term.council_committee.field_prefix -field_name: field_prefix -entity_type: taxonomy_term -bundle: council_committee -label: Prefix -description: 'This should be a short capitalized acronym (e.g. BDGT) that will be used for any agenda items underneath this committee.' -required: true -translatable: false -default_value: { } -default_value_callback: '' -settings: { } -field_type: string diff --git a/web/sites/default/config/field.storage.node.field_reviewed_by_city_attorney.yml b/web/sites/default/config/field.storage.node.field_reviewed_by_city_attorney.yml deleted file mode 100644 index 18e3c4cb81..0000000000 --- a/web/sites/default/config/field.storage.node.field_reviewed_by_city_attorney.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: 6516b1a5-0440-44e3-8829-2a0ff6cbc499 -langcode: en -status: true -dependencies: - module: - - field_permissions - - node - - user -third_party_settings: - field_permissions: - permission_type: public -id: node.field_reviewed_by_city_attorney -field_name: field_reviewed_by_city_attorney -entity_type: node -type: entity_reference -settings: - target_type: user -module: core -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/web/sites/default/config/field.storage.node.field_reviewer.yml b/web/sites/default/config/field.storage.node.field_reviewer.yml index 08c78843dc..7f87c85a83 100644 --- a/web/sites/default/config/field.storage.node.field_reviewer.yml +++ b/web/sites/default/config/field.storage.node.field_reviewer.yml @@ -3,12 +3,8 @@ langcode: en status: true dependencies: module: - - field_permissions - node - user -third_party_settings: - field_permissions: - permission_type: public id: node.field_reviewer field_name: field_reviewer entity_type: node diff --git a/web/sites/default/config/field.storage.taxonomy_term.field_prefix.yml b/web/sites/default/config/field.storage.taxonomy_term.field_prefix.yml deleted file mode 100644 index f1171981a2..0000000000 --- a/web/sites/default/config/field.storage.taxonomy_term.field_prefix.yml +++ /dev/null @@ -1,25 +0,0 @@ -uuid: 1b7499d5-f552-4ecb-956f-2e9f504291de -langcode: en -status: true -dependencies: - module: - - field_permissions - - taxonomy -third_party_settings: - field_permissions: - permission_type: public -id: taxonomy_term.field_prefix -field_name: field_prefix -entity_type: taxonomy_term -type: string -settings: - max_length: 255 - case_sensitive: false - is_ascii: false -module: core -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/web/sites/default/config/group.role.base_group-0c584d933.yml b/web/sites/default/config/group.role.base_group-0c584d933.yml deleted file mode 100644 index 9d04bb5f4e..0000000000 --- a/web/sites/default/config/group.role.base_group-0c584d933.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 9f50bf94-a5cf-42f3-8833-df0dad1a0efd -langcode: en -status: true -dependencies: - config: - - group.type.base_group - enforced: - config: - - user.role.attorney -id: base_group-0c584d933 -label: Attorney -weight: -5 -internal: true -audience: outsider -group_type: base_group -permissions_ui: false -permissions: { } diff --git a/web/sites/default/config/group.role.elected_official-0c584d933.yml b/web/sites/default/config/group.role.elected_official-0c584d933.yml deleted file mode 100644 index c7ad03fb3f..0000000000 --- a/web/sites/default/config/group.role.elected_official-0c584d933.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 6a5e75e9-6af6-49d0-acec-387309198fb0 -langcode: en -status: true -dependencies: - config: - - group.type.elected_official - enforced: - config: - - user.role.attorney -id: elected_official-0c584d933 -label: Attorney -weight: 3 -internal: true -audience: outsider -group_type: elected_official -permissions_ui: false -permissions: { } diff --git a/web/sites/default/config/samlauth.authentication.yml b/web/sites/default/config/samlauth.authentication.yml index c18b297748..0709f93aaa 100644 --- a/web/sites/default/config/samlauth.authentication.yml +++ b/web/sites/default/config/samlauth.authentication.yml @@ -54,7 +54,6 @@ map_users_roles: publisher: publisher policy_author: policy_author policy_editor: policy_editor - attorney: attorney council_author: council_author council_clerk: council_clerk budget: budget diff --git a/web/sites/default/config/system.action.user_add_role_action.attorney.yml b/web/sites/default/config/system.action.user_add_role_action.attorney.yml deleted file mode 100644 index 184668e73f..0000000000 --- a/web/sites/default/config/system.action.user_add_role_action.attorney.yml +++ /dev/null @@ -1,14 +0,0 @@ -uuid: 0aa547b6-cccb-43ff-9804-b11175672b7c -langcode: en -status: true -dependencies: - config: - - user.role.attorney - module: - - user -id: user_add_role_action.attorney -label: 'Add the Attorney role to the selected user(s)' -type: user -plugin: user_add_role_action -configuration: - rid: attorney diff --git a/web/sites/default/config/system.action.user_remove_role_action.attorney.yml b/web/sites/default/config/system.action.user_remove_role_action.attorney.yml deleted file mode 100644 index 91d8b73291..0000000000 --- a/web/sites/default/config/system.action.user_remove_role_action.attorney.yml +++ /dev/null @@ -1,14 +0,0 @@ -uuid: b43b7d03-b1d2-4415-b3ad-fe7135ddc1ff -langcode: en -status: true -dependencies: - config: - - user.role.attorney - module: - - user -id: user_remove_role_action.attorney -label: 'Remove the Attorney role from the selected user(s)' -type: user -plugin: user_remove_role_action -configuration: - rid: attorney diff --git a/web/sites/default/config/user.role.attorney.yml b/web/sites/default/config/user.role.attorney.yml deleted file mode 100644 index ddf322ee8c..0000000000 --- a/web/sites/default/config/user.role.attorney.yml +++ /dev/null @@ -1,18 +0,0 @@ -uuid: 210ab55a-1054-4a25-8c97-2adedde337e1 -langcode: en -status: true -dependencies: - module: - - field_permissions - - file - - lightning_core -third_party_settings: - lightning_core: - description: 'This role is used to limit users that can be added to the attorney review of council documents.' -id: attorney -label: Attorney -weight: -5 -is_admin: null -permissions: - - 'delete own files' - - 'view field_confirmed_time_certain' diff --git a/web/sites/default/config/views.view.attorneys.yml b/web/sites/default/config/views.view.attorneys.yml deleted file mode 100644 index 3ec6572b98..0000000000 --- a/web/sites/default/config/views.view.attorneys.yml +++ /dev/null @@ -1,240 +0,0 @@ -uuid: 07fcdc8a-d734-4d08-9bb2-71486e02a0b2 -langcode: en -status: true -dependencies: - config: - - user.role.attorney - module: - - user -id: attorneys -label: Attorneys -module: views -description: 'View to limit selection of active attorneys in council document review.' -tag: '' -base_table: users_field_data -base_field: uid -display: - default: - id: default - display_title: Master - display_plugin: default - position: 0 - display_options: - title: Attorneys - fields: - name: - id: name - table: users_field_data - field: name - relationship: none - group_type: group - admin_label: '' - entity_type: user - entity_field: name - plugin_id: field - label: '' - exclude: false - alter: - alter_text: false - make_link: false - absolute: false - word_boundary: false - ellipsis: false - strip_tags: false - trim: false - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - click_sort_column: value - type: user_name - settings: { } - group_column: value - group_columns: { } - group_rows: true - delta_limit: 0 - delta_offset: 0 - delta_reversed: false - delta_first_last: false - multi_type: separator - separator: ', ' - field_api_classes: false - pager: - type: mini - options: - offset: 0 - pagination_heading_level: h4 - items_per_page: 10 - total_pages: null - id: 0 - tags: - next: ›› - previous: ‹‹ - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - access: - type: perm - options: - perm: 'access user profiles' - cache: - type: tag - options: { } - empty: { } - sorts: - name: - id: name - table: users_field_data - field: name - relationship: none - group_type: group - admin_label: '' - entity_type: user - entity_field: name - plugin_id: standard - order: ASC - expose: - label: '' - field_identifier: name - exposed: false - arguments: { } - filters: - status: - id: status - table: users_field_data - field: status - entity_type: user - entity_field: status - plugin_id: boolean - value: '1' - group: 1 - expose: - operator: '' - operator_limit_selection: false - operator_list: { } - roles_target_id: - id: roles_target_id - table: user__roles - field: roles_target_id - relationship: none - group_type: group - admin_label: '' - entity_type: user - entity_field: roles - plugin_id: user_roles - operator: or - value: - attorney: attorney - group: 1 - exposed: false - expose: - operator_id: '' - label: '' - description: '' - use_operator: false - operator: '' - operator_limit_selection: false - operator_list: { } - identifier: '' - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - reduce: false - is_grouped: false - group_info: - label: '' - description: '' - identifier: '' - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: { } - reduce_duplicates: false - style: - type: default - options: - grouping: { } - row_class: '' - default_row_class: true - uses_fields: false - row: - type: fields - options: - default_field_elements: true - inline: { } - separator: '' - hide_empty: false - query: - type: views_query - options: - query_comment: '' - disable_sql_rewrite: false - distinct: false - replica: false - query_tags: { } - relationships: { } - header: { } - footer: { } - display_extenders: - metatag_display_extender: { } - cache_metadata: - max-age: -1 - contexts: - - 'languages:language_content' - - 'languages:language_interface' - - url.query_args - - user.permissions - tags: { } - entity_reference_1: - id: entity_reference_1 - display_title: 'Entity Reference' - display_plugin: entity_reference - position: 1 - display_options: - pager: - type: none - options: - offset: 0 - style: - type: entity_reference - options: - search_fields: - name: name - display_extenders: - metatag_display_extender: { } - cache_metadata: - max-age: -1 - contexts: - - 'languages:language_content' - - 'languages:language_interface' - - user.permissions - tags: { } diff --git a/web/sites/default/config/views.view.council_documents.yml b/web/sites/default/config/views.view.council_documents.yml index 302a812776..eb6f671ba3 100644 --- a/web/sites/default/config/views.view.council_documents.yml +++ b/web/sites/default/config/views.view.council_documents.yml @@ -24,7 +24,6 @@ dependencies: - taxonomy.vocabulary.council_document_status - user.role.administrator - user.role.anonymous - - user.role.attorney - user.role.authenticated - user.role.budget - user.role.council_author @@ -1544,7 +1543,6 @@ display: role: anonymous: anonymous authenticated: authenticated - attorney: attorney council_author: council_author council_clerk: council_clerk budget: budget diff --git a/web/sites/default/config/views.view.manage_council_documents.yml b/web/sites/default/config/views.view.manage_council_documents.yml index 5ef9fa9243..5cabd5e5bf 100644 --- a/web/sites/default/config/views.view.manage_council_documents.yml +++ b/web/sites/default/config/views.view.manage_council_documents.yml @@ -30,7 +30,6 @@ dependencies: - taxonomy.vocabulary.council_document_type - taxonomy.vocabulary.council_impact_statement_type - user.role.administrator - - user.role.attorney - user.role.budget - user.role.council_author - user.role.council_clerk @@ -1128,7 +1127,6 @@ display: type: role options: role: - attorney: attorney council_author: council_author council_clerk: council_clerk budget: budget @@ -3045,7 +3043,6 @@ display: manage_upcoming_documents: manage_upcoming_documents default: '0' disposition_documents: '0' - manage_attorney_review: '0' manage_my_assignments: '0' manage_past_documents: '0' manage_templates: '0' @@ -4196,7 +4193,6 @@ display: page_impact_statements: page_impact_statements default: '0' disposition_documents: '0' - manage_attorney_review: '0' manage_my_assignments: '0' manage_past_documents: '0' manage_templates: '0' @@ -6556,699 +6552,6 @@ display: - 'config:field.storage.relation.field_disposition_notes' - 'config:field.storage.relation.field_session_start_datetime' - 'config:workflow_list' - manage_attorney_review: - id: manage_attorney_review - display_title: Attorney - display_plugin: page - position: 7 - display_options: - title: 'Council Documents for Attorney Review' - filters: - latest_translation_affected_revision: - id: latest_translation_affected_revision - table: node_revision - field: latest_translation_affected_revision - relationship: none - group_type: group - admin_label: '' - entity_type: node - plugin_id: latest_translation_affected_revision - operator: '=' - value: '' - group: 1 - exposed: false - expose: - operator_id: '' - label: '' - description: '' - use_operator: false - operator: '' - operator_limit_selection: false - operator_list: { } - identifier: '' - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - is_grouped: false - group_info: - label: '' - description: '' - identifier: '' - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: { } - type: - id: type - table: node_field_data - field: type - relationship: nid - entity_type: node - entity_field: type - plugin_id: bundle - value: - council_document: council_document - group: 1 - expose: - operator_limit_selection: false - operator_list: { } - title: - id: title - table: node_field_data - field: title - relationship: nid - group_type: group - admin_label: '' - entity_type: node - entity_field: title - plugin_id: string - operator: contains - value: '' - group: 1 - exposed: true - expose: - operator_id: title_op - label: Title - description: '' - use_operator: false - operator: title_op - operator_limit_selection: false - operator_list: { } - identifier: title - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - anonymous: '0' - publisher: '0' - policy_author: '0' - policy_editor: '0' - attorney: '0' - council_author: '0' - council_clerk: '0' - budget: '0' - park_editor: '0' - code_editor: '0' - group_creator: '0' - alert_editor: '0' - sitewide_editor: '0' - administrator: '0' - placeholder: '' - is_grouped: false - group_info: - label: '' - description: '' - identifier: '' - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: { } - field_council_document_type_target_id: - id: field_council_document_type_target_id - table: node__field_council_document_type - field: field_council_document_type_target_id - relationship: nid - group_type: group - admin_label: '' - plugin_id: taxonomy_index_tid - operator: or - value: { } - group: 1 - exposed: true - expose: - operator_id: field_council_document_type_target_id_op - label: Type - description: '' - use_operator: false - operator: field_council_document_type_target_id_op - operator_limit_selection: false - operator_list: { } - identifier: field_council_document_type_target_id - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - anonymous: '0' - publisher: '0' - policy_author: '0' - policy_editor: '0' - attorney: '0' - council_author: '0' - council_clerk: '0' - budget: '0' - park_editor: '0' - code_editor: '0' - group_creator: '0' - alert_editor: '0' - sitewide_editor: '0' - administrator: '0' - reduce: false - is_grouped: false - group_info: - label: '' - description: '' - identifier: '' - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: { } - reduce_duplicates: false - vid: council_document_type - type: select - hierarchy: false - limit: true - error_message: true - field_council_document_status_target_id: - id: field_council_document_status_target_id - table: node__field_council_document_status - field: field_council_document_status_target_id - relationship: nid - group_type: group - admin_label: '' - plugin_id: taxonomy_index_tid - operator: empty - value: { } - group: 1 - exposed: false - expose: - operator_id: field_council_document_status_target_id_op - label: 'Council Document Status (field_council_document_status)' - description: '' - use_operator: false - operator: field_council_document_status_target_id_op - operator_limit_selection: false - operator_list: { } - identifier: field_council_document_status_target_id - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - anonymous: '0' - publisher: '0' - policy_author: '0' - policy_editor: '0' - attorney: '0' - council_author: '0' - council_clerk: '0' - budget: '0' - park_editor: '0' - code_editor: '0' - group_creator: '0' - alert_editor: '0' - sitewide_editor: '0' - administrator: '0' - reduce: false - is_grouped: false - group_info: - label: '' - description: '' - identifier: '' - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: { } - reduce_duplicates: false - vid: council_document_status - type: select - hierarchy: false - limit: true - error_message: true - moderation_state: - id: moderation_state - table: node_field_revision - field: moderation_state - relationship: none - group_type: group - admin_label: '' - entity_type: node - plugin_id: moderation_state_filter - operator: in - value: { } - group: 1 - exposed: true - expose: - operator_id: moderation_state_op - label: 'Moderation state' - description: null - use_operator: false - operator: moderation_state_op - operator_limit_selection: false - operator_list: { } - identifier: moderation_state - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - reduce: false - is_grouped: true - group_info: - label: 'Moderation state' - description: '' - identifier: moderation_state - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: - 1: - title: Draft - operator: in - value: - council_document_workflow-draft: council_document_workflow-draft - 2: - title: 'Bureau review' - operator: in - value: - council_document_workflow-bureau_review: council_document_workflow-bureau_review - 3: - title: 'Attorney review' - operator: in - value: - council_document_workflow-attorney_review: council_document_workflow-attorney_review - 4: - title: 'Budget office review' - operator: in - value: - council_document_workflow-budget_office_review: council_document_workflow-budget_office_review - 5: - title: 'Elected review' - operator: in - value: - council_document_workflow-elected_review: council_document_workflow-elected_review - 6: - title: 'Council clerk review' - operator: in - value: - council_document_workflow-council_clerk_review: council_document_workflow-council_clerk_review - 7: - title: 'Ready for agenda' - operator: in - value: - council_document_workflow-ready_for_agenda: council_document_workflow-ready_for_agenda - title_1: - id: title_1 - table: node_field_data - field: title - relationship: nid - group_type: group - admin_label: '' - entity_type: node - entity_field: title - plugin_id: string - operator: not - value: '[Template]' - group: 1 - exposed: false - expose: - operator_id: '' - label: '' - description: '' - use_operator: false - operator: '' - operator_limit_selection: false - operator_list: { } - identifier: '' - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - placeholder: '' - is_grouped: false - group_info: - label: '' - description: '' - identifier: '' - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: { } - field_is_code_change_value: - id: field_is_code_change_value - table: node__field_is_code_change - field: field_is_code_change_value - relationship: nid - group_type: group - admin_label: '' - plugin_id: boolean - operator: '=' - value: All - group: 1 - exposed: true - expose: - operator_id: '' - label: 'Code Change' - description: '' - use_operator: false - operator: field_is_code_change_value_op - operator_limit_selection: false - operator_list: { } - identifier: field_is_code_change_value - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - anonymous: '0' - publisher: '0' - policy_author: '0' - policy_editor: '0' - attorney: '0' - council_author: '0' - council_clerk: '0' - budget: '0' - park_editor: '0' - code_editor: '0' - group_creator: '0' - alert_editor: '0' - sitewide_editor: '0' - administrator: '0' - is_grouped: false - group_info: - label: '' - description: '' - identifier: '' - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: { } - field_is_portland_policy_value: - id: field_is_portland_policy_value - table: node__field_is_portland_policy - field: field_is_portland_policy_value - relationship: nid - group_type: group - admin_label: '' - plugin_id: boolean - operator: '=' - value: All - group: 1 - exposed: true - expose: - operator_id: '' - label: 'Policy Change' - description: '' - use_operator: false - operator: field_is_portland_policy_value_op - operator_limit_selection: false - operator_list: { } - identifier: field_is_portland_policy_value - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - anonymous: '0' - publisher: '0' - policy_author: '0' - policy_editor: '0' - attorney: '0' - council_author: '0' - council_clerk: '0' - budget: '0' - park_editor: '0' - code_editor: '0' - group_creator: '0' - alert_editor: '0' - sitewide_editor: '0' - administrator: '0' - is_grouped: false - group_info: - label: '' - description: '' - identifier: '' - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: { } - uid: - id: uid - table: node_field_data - field: uid - relationship: nid - group_type: group - admin_label: '' - entity_type: node - entity_field: uid - plugin_id: user_name - operator: in - value: { } - group: 1 - exposed: true - expose: - operator_id: uid_op - label: 'Authored by' - description: '' - use_operator: false - operator: uid_op - operator_limit_selection: false - operator_list: { } - identifier: uid - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - anonymous: '0' - publisher: '0' - policy_author: '0' - policy_editor: '0' - attorney: '0' - council_author: '0' - council_clerk: '0' - budget: '0' - park_editor: '0' - code_editor: '0' - group_creator: '0' - alert_editor: '0' - sitewide_editor: '0' - administrator: '0' - reduce: false - is_grouped: false - group_info: - label: '' - description: '' - identifier: '' - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: { } - field_requested_council_date_value: - id: field_requested_council_date_value - table: node__field_requested_council_date - field: field_requested_council_date_value - relationship: nid - group_type: group - admin_label: '' - plugin_id: datetime - operator: '>=' - value: - min: '' - max: '' - value: today - type: date - group: 2 - exposed: false - expose: - operator_id: '' - label: '' - description: '' - use_operator: false - operator: '' - operator_limit_selection: false - operator_list: { } - identifier: '' - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - min_placeholder: '' - max_placeholder: '' - placeholder: '' - is_grouped: false - group_info: - label: '' - description: '' - identifier: '' - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: { } - field_requested_council_date_value_1: - id: field_requested_council_date_value_1 - table: node__field_requested_council_date - field: field_requested_council_date_value - relationship: nid - group_type: group - admin_label: '' - plugin_id: datetime - operator: empty - value: - min: '' - max: '' - value: '' - type: date - group: 2 - exposed: false - expose: - operator_id: '' - label: '' - description: '' - use_operator: false - operator: '' - operator_limit_selection: false - operator_list: { } - identifier: '' - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - min_placeholder: '' - max_placeholder: '' - placeholder: '' - is_grouped: false - group_info: - label: '' - description: '' - identifier: '' - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: { } - field_needs_attorney_review_value: - id: field_needs_attorney_review_value - table: node__field_needs_attorney_review - field: field_needs_attorney_review_value - relationship: nid - group_type: group - admin_label: '' - plugin_id: boolean - operator: '=' - value: '1' - group: 1 - exposed: false - expose: - operator_id: '' - label: '' - description: '' - use_operator: false - operator: '' - operator_limit_selection: false - operator_list: { } - identifier: '' - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - is_grouped: false - group_info: - label: '' - description: '' - identifier: '' - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: { } - filter_groups: - operator: AND - groups: - 1: AND - 2: OR - defaults: - title: false - filters: false - filter_groups: false - header: false - display_description: '' - header: - result: - id: result - table: views - field: result - relationship: none - group_type: group - admin_label: '' - plugin_id: result - empty: true - content: "Add council document\r\n

Displaying @start - @end of @total ordered by requested council date. Attorney review required if intergovernmental agreement, contract, code change, easements, charter amendments, or comprehensive plan amendments.

" - display_extenders: - metatag_display_extender: { } - path: council/documents/review/attorney - menu: - type: normal - title: Attorney - description: '' - weight: 5 - expanded: false - menu_name: council-toolbar - parent: '' - context: '0' - use_admin_theme: true - cache_metadata: - max-age: -1 - contexts: - - 'languages:language_content' - - 'languages:language_interface' - - url - - url.query_args - - 'user.node_grants:view' - - user.roles - tags: - - 'config:field.storage.node.field_agenda_type' - - 'config:field.storage.node.field_bureau' - - 'config:field.storage.node.field_confirmed_time_certain' - - 'config:field.storage.node.field_council_document_status' - - 'config:field.storage.node.field_council_document_type' - - 'config:field.storage.node.field_introduced_by' - - 'config:field.storage.node.field_requested_council_date' - - 'config:field.storage.node.field_requested_start_time' - - 'config:field.storage.node.field_reviewer' - - 'config:field.storage.node.field_time_requested' - - 'config:workflow_list' manage_my_assignments: id: manage_my_assignments display_title: 'My Assignments' diff --git a/web/sites/default/config/views.view.reference_council_documents_without_status.yml b/web/sites/default/config/views.view.reference_council_documents_without_status.yml index ba1653e435..92f9f6d958 100644 --- a/web/sites/default/config/views.view.reference_council_documents_without_status.yml +++ b/web/sites/default/config/views.view.reference_council_documents_without_status.yml @@ -17,7 +17,6 @@ dependencies: - node.type.council_document - taxonomy.vocabulary.council_document_type - user.role.administrator - - user.role.attorney - user.role.council_author - user.role.council_clerk module: @@ -847,7 +846,6 @@ display: type: role options: role: - attorney: attorney council_author: council_author council_clerk: council_clerk administrator: administrator diff --git a/web/sites/default/config/workflows.workflow.council_document_workflow.yml b/web/sites/default/config/workflows.workflow.council_document_workflow.yml index 67b5165d6e..d9fa4af933 100644 --- a/web/sites/default/config/workflows.workflow.council_document_workflow.yml +++ b/web/sites/default/config/workflows.workflow.council_document_workflow.yml @@ -27,12 +27,12 @@ type_settings: published: false default_revision: true cancelled: - label: 'Cancelled (To Be Deleted)' + label: 'Cancelled (request deletion)' weight: 4 published: false default_revision: true code_review: - label: 'Code review' + label: 'Code review (if needed)' weight: -3 published: false default_revision: false @@ -77,18 +77,7 @@ type_settings: - ready_for_agenda - unpublished to: attorney_review - weight: 9 - budget_office_review_council_clerk_: - label: 'Budget Office Review (Council Clerk)' - from: - - cancelled - - code_review - - council_clerk_review - - published - - ready_for_agenda - - unpublished - to: budget_office_review - weight: 10 + weight: 1 bureau_review_council_clerk_: label: 'Bureau Review (Council Clerk)' from: @@ -99,7 +88,7 @@ type_settings: - ready_for_agenda - unpublished to: bureau_review - weight: 6 + weight: 0 cancel_document: label: 'Cancel Document' from: @@ -109,7 +98,7 @@ type_settings: - draft - elected_review to: cancelled - weight: 4 + weight: 7 code_review_council_clerk_: label: 'Code Review (Council Clerk)' from: @@ -120,7 +109,7 @@ type_settings: - ready_for_agenda - unpublished to: code_review - weight: 9 + weight: 2 council_clerk_review_council_clerk_: label: 'Council Clerk Review (Council Clerk)' from: @@ -131,7 +120,7 @@ type_settings: - ready_for_agenda - unpublished to: council_clerk_review - weight: 7 + weight: 4 create_new_draft: label: 'Create New Draft' from: @@ -142,7 +131,7 @@ type_settings: - draft - elected_review to: draft - weight: -5 + weight: -9 elected_review_council_clerk_: label: 'Elected Review (Council Clerk)' from: @@ -153,7 +142,7 @@ type_settings: - ready_for_agenda - unpublished to: elected_review - weight: 8 + weight: 3 move_to_attorney_review: label: 'Move to attorney review' from: @@ -163,17 +152,7 @@ type_settings: - draft - elected_review to: attorney_review - weight: -3 - move_to_budget_office_review: - label: 'Move to budget office review' - from: - - attorney_review - - budget_office_review - - bureau_review - - draft - - elected_review - to: budget_office_review - weight: -2 + weight: -7 move_to_bureau_review: label: 'Move to bureau review' from: @@ -183,7 +162,7 @@ type_settings: - draft - elected_review to: bureau_review - weight: -4 + weight: -8 move_to_code_review: label: 'Move to code review' from: @@ -193,7 +172,7 @@ type_settings: - draft - elected_review to: code_review - weight: -4 + weight: -6 move_to_council_clerk_review: label: 'Move to council clerk review' from: @@ -203,7 +182,7 @@ type_settings: - draft - elected_review to: council_clerk_review - weight: 0 + weight: -4 move_to_elected_review: label: 'Move to elected review' from: @@ -213,13 +192,13 @@ type_settings: - draft - elected_review to: elected_review - weight: -1 + weight: -5 move_to_unpublished: label: 'Move to unpublished' from: - published to: unpublished - weight: 3 + weight: -1 publish: label: Publish from: @@ -233,13 +212,13 @@ type_settings: - ready_for_agenda - unpublished to: published - weight: 2 + weight: -2 published_to_published: label: 'Published to Published (Council Clerk and Budget)' from: - published to: published - weight: 11 + weight: 6 ready_for_agenda: label: 'Ready for agenda' from: @@ -251,7 +230,7 @@ type_settings: - published - unpublished to: ready_for_agenda - weight: 1 + weight: -3 ready_for_agenda_council_clerk_: label: 'Ready for Agenda (Council Clerk)' from: diff --git a/web/themes/custom/cloudy/templates/content/council-document/node--council-document.html.twig b/web/themes/custom/cloudy/templates/content/council-document/node--council-document.html.twig index bf1ba98524..34b1ea7379 100644 --- a/web/themes/custom/cloudy/templates/content/council-document/node--council-document.html.twig +++ b/web/themes/custom/cloudy/templates/content/council-document/node--council-document.html.twig @@ -25,7 +25,6 @@ 'field_time_requested', 'field_is_iga', 'field_is_portland_policy', - 'field_reviewed_by_city_attorney', 'field_auditor', 'field_council_clerk', 'field_date_of_final_disposition', @@ -95,7 +94,6 @@ {{ content.field_is_amends_budget }} {{ content.field_is_contract }} {{ content.field_is_iga }} - {{ content.field_reviewed_by_city_attorney }} {{ content.field_disposition_notes }}