From 4d7c41bd37cf29c5f9bb40d65f9181ce7116539e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jurij=20Podgor=C5=A1ek?= Date: Sun, 17 Mar 2024 18:44:49 +0100 Subject: [PATCH 1/8] WIP view za zadnje spremembe --- config/sync/system.site.yml | 2 +- config/sync/views.view.zadnje_spremembe.yml | 295 ++++++++++++++++++++ 2 files changed, 296 insertions(+), 1 deletion(-) create mode 100644 config/sync/views.view.zadnje_spremembe.yml diff --git a/config/sync/system.site.yml b/config/sync/system.site.yml index 94d7ecc..987e401 100644 --- a/config/sync/system.site.yml +++ b/config/sync/system.site.yml @@ -8,7 +8,7 @@ slogan: '' page: 403: '' 404: '' - front: /user/login + front: /zadnje-spremembe admin_compact_mode: false weight_select_max: 100 default_langcode: en diff --git a/config/sync/views.view.zadnje_spremembe.yml b/config/sync/views.view.zadnje_spremembe.yml new file mode 100644 index 0000000..3ce40d3 --- /dev/null +++ b/config/sync/views.view.zadnje_spremembe.yml @@ -0,0 +1,295 @@ +uuid: 89fa6e21-3730-4602-b26f-d4f1f45f52d4 +langcode: en +status: true +dependencies: + config: + - node.type.concept + module: + - node + - user +id: zadnje_spremembe +label: 'Zadnje spremembe' +module: views +description: '' +tag: '' +base_table: node_field_revision +base_field: vid +display: + default: + id: default + display_title: Default + display_plugin: default + position: 0 + display_options: + title: 'Zadnje spremembe' + fields: + changed: + id: changed + table: node_field_revision + field: changed + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: changed + 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: timestamp + settings: + date_format: medium + custom_date_format: '' + timezone: '' + tooltip: + date_format: '' + custom_date_format: '' + time_diff: + enabled: false + future_format: '@interval hence' + past_format: '@interval ago' + granularity: 2 + refresh: 60 + 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 + title: + id: title + table: node_field_revision + field: title + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: title + 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: string + settings: + link_to_entity: false + 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 + uid: + id: uid + table: node_field_revision + field: uid + entity_type: node + entity_field: uid + plugin_id: field + pager: + type: mini + options: + offset: 0 + items_per_page: 20 + 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: 'view all revisions' + cache: + type: tag + options: { } + empty: { } + sorts: + changed: + id: changed + table: node_field_revision + field: changed + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: changed + plugin_id: date + order: DESC + expose: + label: '' + field_identifier: '' + exposed: false + granularity: second + arguments: { } + filters: + status: + id: status + table: node_field_revision + field: status + entity_type: node + entity_field: status + plugin_id: boolean + value: '1' + group: 1 + expose: + operator: '' + type: + id: type + table: node_field_data + field: type + relationship: nid + entity_type: node + entity_field: type + plugin_id: bundle + value: + concept: concept + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + columns: + changed: changed + title: title + default: '-1' + info: + changed: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + title: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + override: true + sticky: false + summary: '' + empty_table: false + caption: '' + description: '' + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: + nid: + id: nid + table: node_field_revision + field: nid + relationship: none + group_type: group + admin_label: 'Get the actual content from a content revision.' + entity_type: node + entity_field: nid + plugin_id: standard + required: true + header: { } + footer: { } + display_extenders: { } + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url.query_args + - 'user.node_grants:view' + - user.permissions + tags: { } + page_1: + id: page_1 + display_title: Page + display_plugin: page + position: 1 + display_options: + display_extenders: { } + path: zadnje-spremembe + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url.query_args + - 'user.node_grants:view' + - user.permissions + tags: { } -- 2.30.2 From 843ff7badbad8fdc15325c5e9140bc6be276d03d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jurij=20Podgor=C5=A1ek?= Date: Sun, 17 Mar 2024 19:22:53 +0100 Subject: [PATCH 2/8] View za revision history --- composer.json | 1 + composer.lock | 286 +++++++++++++++++- config/sync/core.extension.yml | 1 + config/sync/devel.settings.yml | 12 + config/sync/devel.toolbar.settings.yml | 10 + config/sync/language/hr/system.menu.devel.yml | 1 + config/sync/language/sl/system.menu.devel.yml | 1 + .../sl/views.view.moderated_content.yml | 11 +- config/sync/language/sr/system.menu.devel.yml | 1 + config/sync/system.menu.devel.yml | 13 + config/sync/views.view.content.yml | 2 +- config/sync/views.view.zadnje_spremembe.yml | 109 ++++++- web/sites/yufu.dev.services.yml | 3 + 13 files changed, 439 insertions(+), 12 deletions(-) create mode 100644 config/sync/devel.settings.yml create mode 100644 config/sync/devel.toolbar.settings.yml create mode 100644 config/sync/language/hr/system.menu.devel.yml create mode 100644 config/sync/language/sl/system.menu.devel.yml create mode 100644 config/sync/language/sr/system.menu.devel.yml create mode 100644 config/sync/system.menu.devel.yml create mode 100644 web/sites/yufu.dev.services.yml diff --git a/composer.json b/composer.json index 4dae1e8..4c8ab69 100644 --- a/composer.json +++ b/composer.json @@ -25,6 +25,7 @@ "drupal/core-project-message": "^10.0", "drupal/core-recommended": "^10.2.4", "drupal/diff": "^1.1", + "drupal/devel": "^5.1", "drupal/gin": "^3.0@RC", "drupal/gin_toolbar": "^1.0@RC", "drupal/jsonapi_menu_items": "^1.2", diff --git a/composer.lock b/composer.lock index 282695c..a2d47a0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "39f3d592b41324eb32edb9388cc9682b", + "content-hash": "6fdae41d9930b076d636c871454e056b", "packages": [ { "name": "asm89/stack-cors", @@ -1124,6 +1124,97 @@ }, "time": "2023-02-01T09:20:38+00:00" }, + { + "name": "doctrine/common", + "version": "3.4.3", + "source": { + "type": "git", + "url": "https://github.com/doctrine/common.git", + "reference": "8b5e5650391f851ed58910b3e3d48a71062eeced" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/common/zipball/8b5e5650391f851ed58910b3e3d48a71062eeced", + "reference": "8b5e5650391f851ed58910b3e3d48a71062eeced", + "shasum": "" + }, + "require": { + "doctrine/persistence": "^2.0 || ^3.0", + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "doctrine/coding-standard": "^9.0 || ^10.0", + "doctrine/collections": "^1", + "phpstan/phpstan": "^1.4.1", + "phpstan/phpstan-phpunit": "^1", + "phpunit/phpunit": "^7.5.20 || ^8.5 || ^9.0", + "squizlabs/php_codesniffer": "^3.0", + "symfony/phpunit-bridge": "^6.1", + "vimeo/psalm": "^4.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Common\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + }, + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + } + ], + "description": "PHP Doctrine Common project is a library that provides additional functionality that other Doctrine projects depend on such as better reflection support, proxies and much more.", + "homepage": "https://www.doctrine-project.org/projects/common.html", + "keywords": [ + "common", + "doctrine", + "php" + ], + "support": { + "issues": "https://github.com/doctrine/common/issues", + "source": "https://github.com/doctrine/common/tree/3.4.3" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcommon", + "type": "tidelift" + } + ], + "time": "2022-10-09T11:47:59+00:00" + }, { "name": "doctrine/deprecations", "version": "1.1.3", @@ -1171,6 +1262,97 @@ }, "time": "2024-01-30T19:34:25+00:00" }, + { + "name": "doctrine/event-manager", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/event-manager.git", + "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/event-manager/zipball/750671534e0241a7c50ea5b43f67e23eb5c96f32", + "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32", + "shasum": "" + }, + "require": { + "php": "^8.1" + }, + "conflict": { + "doctrine/common": "<2.9" + }, + "require-dev": { + "doctrine/coding-standard": "^10", + "phpstan/phpstan": "^1.8.8", + "phpunit/phpunit": "^9.5", + "vimeo/psalm": "^4.28" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Common\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + }, + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + } + ], + "description": "The Doctrine Event Manager is a simple PHP event system that was built to be used with the various Doctrine projects.", + "homepage": "https://www.doctrine-project.org/projects/event-manager.html", + "keywords": [ + "event", + "event dispatcher", + "event manager", + "event system", + "events" + ], + "support": { + "issues": "https://github.com/doctrine/event-manager/issues", + "source": "https://github.com/doctrine/event-manager/tree/2.0.0" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fevent-manager", + "type": "tidelift" + } + ], + "time": "2022-10-12T20:59:15+00:00" + }, { "name": "doctrine/lexer", "version": "2.1.1", @@ -1249,6 +1431,104 @@ ], "time": "2024-02-05T11:35:39+00:00" }, + { + "name": "doctrine/persistence", + "version": "3.3.2", + "source": { + "type": "git", + "url": "https://github.com/doctrine/persistence.git", + "reference": "477da35bd0255e032826f440b94b3e37f2d56f42" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/persistence/zipball/477da35bd0255e032826f440b94b3e37f2d56f42", + "reference": "477da35bd0255e032826f440b94b3e37f2d56f42", + "shasum": "" + }, + "require": { + "doctrine/event-manager": "^1 || ^2", + "php": "^7.2 || ^8.0", + "psr/cache": "^1.0 || ^2.0 || ^3.0" + }, + "conflict": { + "doctrine/common": "<2.10" + }, + "require-dev": { + "composer/package-versions-deprecated": "^1.11", + "doctrine/coding-standard": "^11", + "doctrine/common": "^3.0", + "phpstan/phpstan": "1.9.4", + "phpstan/phpstan-phpunit": "^1", + "phpstan/phpstan-strict-rules": "^1.1", + "phpunit/phpunit": "^8.5 || ^9.5", + "symfony/cache": "^4.4 || ^5.4 || ^6.0", + "vimeo/psalm": "4.30.0 || 5.3.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Persistence\\": "src/Persistence" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + }, + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + } + ], + "description": "The Doctrine Persistence project is a set of shared interfaces and functionality that the different Doctrine object mappers share.", + "homepage": "https://www.doctrine-project.org/projects/persistence.html", + "keywords": [ + "mapper", + "object", + "odm", + "orm", + "persistence" + ], + "support": { + "issues": "https://github.com/doctrine/persistence/issues", + "source": "https://github.com/doctrine/persistence/tree/3.3.2" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fpersistence", + "type": "tidelift" + } + ], + "time": "2024-03-12T14:54:36+00:00" + }, { "name": "drupal/cer", "version": "5.0.0-beta3", @@ -1896,6 +2176,10 @@ "homepage": "https://www.drupal.org/u/realityloop", "role": "Maintainer" }, + { + "name": "Junyor", + "homepage": "https://www.drupal.org/user/7006" + }, { "name": "lhangea", "homepage": "https://www.drupal.org/user/2743803" diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 973b689..9b657f6 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -18,6 +18,7 @@ module: contextual: 0 datetime: 0 dblog: 0 + devel: 0 diff: 0 dynamic_page_cache: 0 editor: 0 diff --git a/config/sync/devel.settings.yml b/config/sync/devel.settings.yml new file mode 100644 index 0000000..976cc91 --- /dev/null +++ b/config/sync/devel.settings.yml @@ -0,0 +1,12 @@ +_core: + default_config_hash: Aqx6J0yYT6mVqT0fbjeP4JkoL-700nmudVF5d6Pq2Yo +page_alter: false +raw_names: false +error_handlers: + 1: 1 +rebuild_theme: false +debug_mail_file_format: '%to-%subject-%datetime.mail.txt' +debug_mail_directory: 'temporary://devel-mails' +devel_dumper: var_dumper +debug_logfile: 'temporary://drupal_debug.txt' +debug_pre: true diff --git a/config/sync/devel.toolbar.settings.yml b/config/sync/devel.toolbar.settings.yml new file mode 100644 index 0000000..76ada43 --- /dev/null +++ b/config/sync/devel.toolbar.settings.yml @@ -0,0 +1,10 @@ +_core: + default_config_hash: IQjf_ytthngZTAk_MU8-74VecArWD3G5g0oEH6PM6GA +toolbar_items: + - devel.admin_settings_link + - devel.cache_clear + - devel.container_info.service + - devel.menu_rebuild + - devel.reinstall + - devel.route_info + - devel.run_cron diff --git a/config/sync/language/hr/system.menu.devel.yml b/config/sync/language/hr/system.menu.devel.yml new file mode 100644 index 0000000..fcc8682 --- /dev/null +++ b/config/sync/language/hr/system.menu.devel.yml @@ -0,0 +1 @@ +label: Razvoj diff --git a/config/sync/language/sl/system.menu.devel.yml b/config/sync/language/sl/system.menu.devel.yml new file mode 100644 index 0000000..fcc8682 --- /dev/null +++ b/config/sync/language/sl/system.menu.devel.yml @@ -0,0 +1 @@ +label: Razvoj diff --git a/config/sync/language/sl/views.view.moderated_content.yml b/config/sync/language/sl/views.view.moderated_content.yml index 84479bd..2574aca 100644 --- a/config/sync/language/sl/views.view.moderated_content.yml +++ b/config/sync/language/sl/views.view.moderated_content.yml @@ -7,6 +7,8 @@ display: fields: title: label: Naslov + type: + label: 'Tip vsebine' name: label: Avtor changed: @@ -16,14 +18,17 @@ display: exposed_form: options: submit_button: Počisti - reset_button_label: Ponastavi + reset_button_label: Poništi exposed_sorts_label: 'Rasporedi po' - sort_asc_label: Naraščajoče - sort_desc_label: Padajoče + sort_asc_label: Uzlazno + sort_desc_label: Silazno filters: title: expose: label: Naslov + type: + expose: + label: 'Tip vsebine' langcode: expose: label: Jezik diff --git a/config/sync/language/sr/system.menu.devel.yml b/config/sync/language/sr/system.menu.devel.yml new file mode 100644 index 0000000..fcc8682 --- /dev/null +++ b/config/sync/language/sr/system.menu.devel.yml @@ -0,0 +1 @@ +label: Razvoj diff --git a/config/sync/system.menu.devel.yml b/config/sync/system.menu.devel.yml new file mode 100644 index 0000000..bd55901 --- /dev/null +++ b/config/sync/system.menu.devel.yml @@ -0,0 +1,13 @@ +uuid: f9ee5a80-6539-4ade-ad1c-4f71f3739e60 +langcode: en +status: true +dependencies: + enforced: + module: + - devel +_core: + default_config_hash: 3V-l1uuTcyirYOGLPZV5HWaDfr02uEbWZJIwc8Byz-c +id: devel +label: Development +description: 'Links related to Devel module.' +locked: true diff --git a/config/sync/views.view.content.yml b/config/sync/views.view.content.yml index 06ec436..9b9eb4c 100644 --- a/config/sync/views.view.content.yml +++ b/config/sync/views.view.content.yml @@ -8,7 +8,7 @@ dependencies: _core: default_config_hash: 12Bd0mJQFIaXAkRfMVCAAcZ0oaxm94PoK8oHR9hkLmY id: content -label: Vsebine +label: Sadržaj module: node description: 'Find and manage content.' tag: default diff --git a/config/sync/views.view.zadnje_spremembe.yml b/config/sync/views.view.zadnje_spremembe.yml index 3ce40d3..2551aad 100644 --- a/config/sync/views.view.zadnje_spremembe.yml +++ b/config/sync/views.view.zadnje_spremembe.yml @@ -33,16 +33,34 @@ display: entity_type: node entity_field: changed plugin_id: field - label: '' + label: Čas exclude: false alter: alter_text: false + text: '' make_link: false + path: '' absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 word_boundary: false ellipsis: false + more_link: false + more_link_text: '' + more_link_path: '' strip_tags: false trim: false + preserve_tags: '' html: false element_type: '' element_class: '' @@ -71,6 +89,7 @@ display: past_format: '@interval ago' granularity: 2 refresh: 60 + description: '' group_column: value group_columns: { } group_rows: true @@ -91,16 +110,34 @@ display: entity_type: node entity_field: title plugin_id: field - label: '' + label: Pojem exclude: false alter: alter_text: false + text: '' make_link: false + path: '' absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 word_boundary: false ellipsis: false + more_link: false + more_link_text: '' + more_link_path: '' strip_tags: false trim: false + preserve_tags: '' html: false element_type: '' element_class: '' @@ -128,13 +165,71 @@ display: multi_type: separator separator: ', ' field_api_classes: false - uid: - id: uid - table: node_field_revision - field: uid + revision_uid: + id: revision_uid + table: node_revision + field: revision_uid + relationship: none + group_type: group + admin_label: '' entity_type: node - entity_field: uid + entity_field: revision_uid plugin_id: field + label: 'Revision user' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + 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: target_id + type: entity_reference_label + settings: + link: true + group_column: target_id + 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: diff --git a/web/sites/yufu.dev.services.yml b/web/sites/yufu.dev.services.yml new file mode 100644 index 0000000..962894a --- /dev/null +++ b/web/sites/yufu.dev.services.yml @@ -0,0 +1,3 @@ +services: + cache.backend.null: + class: Drupal\Core\Cache\NullBackendFactory -- 2.30.2 From 5c6ad3000569ae1717c8629e954b496714f00e18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jurij=20Podgor=C5=A1ek?= Date: Mon, 1 Apr 2024 17:35:40 +0200 Subject: [PATCH 3/8] Kazi tudi drafte, prikazi moderation state --- composer.lock | 176 ++++++++++++------ ...tity_view_display.node.concept.default.yml | 2 +- ...ntity_view_display.node.concept.teaser.yml | 2 +- .../sync/core.entity_view_mode.node.diff.yml | 1 + config/sync/views.view.zadnje_spremembe.yml | 75 ++++++-- 5 files changed, 186 insertions(+), 70 deletions(-) diff --git a/composer.lock b/composer.lock index a2d47a0..d154b96 100644 --- a/composer.lock +++ b/composer.lock @@ -629,16 +629,16 @@ }, { "name": "consolidation/output-formatters", - "version": "4.3.2", + "version": "4.4.0", "source": { "type": "git", "url": "https://github.com/consolidation/output-formatters.git", - "reference": "06711568b4cd169700ff7e8075db0a9a341ceb58" + "reference": "6812952176c5acc8ed44bdfa78fe93b745c18f25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/06711568b4cd169700ff7e8075db0a9a341ceb58", - "reference": "06711568b4cd169700ff7e8075db0a9a341ceb58", + "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/6812952176c5acc8ed44bdfa78fe93b745c18f25", + "reference": "6812952176c5acc8ed44bdfa78fe93b745c18f25", "shasum": "" }, "require": { @@ -677,9 +677,9 @@ "description": "Format text by applying transformations provided by plug-in formatters.", "support": { "issues": "https://github.com/consolidation/output-formatters/issues", - "source": "https://github.com/consolidation/output-formatters/tree/4.3.2" + "source": "https://github.com/consolidation/output-formatters/tree/4.4.0" }, - "time": "2023-07-06T04:45:41+00:00" + "time": "2024-03-30T13:38:29+00:00" }, { "name": "consolidation/robo", @@ -870,16 +870,16 @@ }, { "name": "consolidation/site-process", - "version": "5.2.0", + "version": "5.3.0", "source": { "type": "git", "url": "https://github.com/consolidation/site-process.git", - "reference": "6c44638d7af8a8b4abe12c3180701243f480539d" + "reference": "5e8eff50fd0015e7ca0b6ce4082cacef012f2f77" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/site-process/zipball/6c44638d7af8a8b4abe12c3180701243f480539d", - "reference": "6c44638d7af8a8b4abe12c3180701243f480539d", + "url": "https://api.github.com/repos/consolidation/site-process/zipball/5e8eff50fd0015e7ca0b6ce4082cacef012f2f77", + "reference": "5e8eff50fd0015e7ca0b6ce4082cacef012f2f77", "shasum": "" }, "require": { @@ -921,9 +921,9 @@ "description": "A thin wrapper around the Symfony Process Component that allows applications to use the Site Alias library to specify the target for a remote call.", "support": { "issues": "https://github.com/consolidation/site-process/issues", - "source": "https://github.com/consolidation/site-process/tree/5.2.0" + "source": "https://github.com/consolidation/site-process/tree/5.3.0" }, - "time": "2022-12-06T17:57:16+00:00" + "time": "2024-04-01T12:42:12+00:00" }, { "name": "cweagans/composer-patches", @@ -1603,17 +1603,17 @@ }, { "name": "drupal/config_ignore", - "version": "3.1.0", + "version": "3.2.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/config_ignore.git", - "reference": "8.x-3.1" + "reference": "8.x-3.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/config_ignore-8.x-3.1.zip", - "reference": "8.x-3.1", - "shasum": "5e60f312e02735060d5e5b1724330bb243face4c" + "url": "https://ftp.drupal.org/files/projects/config_ignore-8.x-3.2.zip", + "reference": "8.x-3.2", + "shasum": "00335fc1ddeb4ed93f245dd6963d99b3c084c052" }, "require": { "drupal/core": "^8.8 || ^9 || ^10" @@ -1625,8 +1625,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-3.1", - "datestamp": "1699302168", + "version": "8.x-3.2", + "datestamp": "1705226226", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2117,6 +2117,65 @@ }, "time": "2024-03-06T08:23:56+00:00" }, + { + "name": "drupal/devel", + "version": "5.2.1", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/devel.git", + "reference": "5.2.1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/devel-5.2.1.zip", + "reference": "5.2.1", + "shasum": "793861751e01092fe8bc7c0cd47589ebea2bb8df" + }, + "require": { + "doctrine/common": "^2.7 || ^3.4", + "drupal/core": ">=10.0 <12.0.0-stable", + "php": ">=8.1", + "symfony/var-dumper": "^4 || ^5 || ^6" + }, + "conflict": { + "drush/drush": "<12.5.1", + "kint-php/kint": "<3" + }, + "require-dev": { + "drush/drush": "^12.5.1" + }, + "suggest": { + "kint-php/kint": "Kint provides an informative display of arrays/objects. Useful for debugging and developing." + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "5.2.1", + "datestamp": "1711328410", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "moshe weitzman", + "homepage": "https://www.drupal.org/user/23" + } + ], + "description": "Various blocks, pages, and functions for developers.", + "homepage": "https://www.drupal.org/project/devel", + "support": { + "source": "https://gitlab.com/drupalspoons/devel", + "issues": "https://gitlab.com/drupalspoons/devel/-/issues", + "slack": "https://drupal.slack.com/archives/C012WAW1MH6" + } + }, { "name": "drupal/diff", "version": "1.1.0", @@ -2214,17 +2273,17 @@ }, { "name": "drupal/gin", - "version": "3.0.0-rc7", + "version": "3.0.0-rc9", "source": { "type": "git", "url": "https://git.drupalcode.org/project/gin.git", - "reference": "8.x-3.0-rc7" + "reference": "8.x-3.0-rc9" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/gin-8.x-3.0-rc7.zip", - "reference": "8.x-3.0-rc7", - "shasum": "9f91862fc82ef8b0adbf34b26caa3c42d4f1f6b2" + "url": "https://ftp.drupal.org/files/projects/gin-8.x-3.0-rc9.zip", + "reference": "8.x-3.0-rc9", + "shasum": "130dec0ea8152bc796d8bbca1bc97b2ae0c381f4" }, "require": { "drupal/core": "^9 || ^10", @@ -2233,8 +2292,8 @@ "type": "drupal-theme", "extra": { "drupal": { - "version": "8.x-3.0-rc7", - "datestamp": "1697193234", + "version": "8.x-3.0-rc9", + "datestamp": "1706705034", "security-coverage": { "status": "not-covered", "message": "RC releases are not covered by Drupal security advisories." @@ -2511,26 +2570,29 @@ }, { "name": "drupal/single_content_sync", - "version": "1.3.9", + "version": "1.4.4", "source": { "type": "git", "url": "https://git.drupalcode.org/project/single_content_sync.git", - "reference": "1.3.9" + "reference": "1.4.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/single_content_sync-1.3.9.zip", - "reference": "1.3.9", - "shasum": "1975bd88bbd0fd9ada8f53a9c4c3296445da0f85" + "url": "https://ftp.drupal.org/files/projects/single_content_sync-1.4.4.zip", + "reference": "1.4.4", + "shasum": "55194b9c2bd4f15dfb69d451fbef63740b68a8c5" }, "require": { - "drupal/core": "^9.3 || ^10" + "drupal/core": "^9.3 || ^10", + "ext-dom": "*", + "ext-zip": "*", + "php": ">=7.4" }, "type": "drupal-module", "extra": { "drupal": { - "version": "1.3.9", - "datestamp": "1679596906", + "version": "1.4.4", + "datestamp": "1699421610", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2694,16 +2756,16 @@ }, { "name": "drush/drush", - "version": "12.4.4", + "version": "12.5.1", "source": { "type": "git", "url": "https://github.com/drush-ops/drush.git", - "reference": "a6585cddae47144413565f3c1cd29debc69f6b41" + "reference": "71fcea30a22e7336e17be18bb5945400b2c63fad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drush-ops/drush/zipball/a6585cddae47144413565f3c1cd29debc69f6b41", - "reference": "a6585cddae47144413565f3c1cd29debc69f6b41", + "url": "https://api.github.com/repos/drush-ops/drush/zipball/71fcea30a22e7336e17be18bb5945400b2c63fad", + "reference": "71fcea30a22e7336e17be18bb5945400b2c63fad", "shasum": "" }, "require": { @@ -2826,7 +2888,7 @@ "issues": "https://github.com/drush-ops/drush/issues", "security": "https://github.com/drush-ops/drush/security/advisories", "slack": "https://drupal.slack.com/messages/C62H9CWQM", - "source": "https://github.com/drush-ops/drush/tree/12.4.4" + "source": "https://github.com/drush-ops/drush/tree/12.5.1" }, "funding": [ { @@ -2834,7 +2896,7 @@ "type": "github" } ], - "time": "2024-03-02T12:14:56+00:00" + "time": "2024-03-20T15:03:27+00:00" }, { "name": "egulias/email-validator", @@ -3399,16 +3461,16 @@ }, { "name": "league/container", - "version": "4.2.0", + "version": "4.2.2", "source": { "type": "git", "url": "https://github.com/thephpleague/container.git", - "reference": "375d13cb828649599ef5d48a339c4af7a26cd0ab" + "reference": "ff346319ca1ff0e78277dc2311a42107cc1aab88" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/container/zipball/375d13cb828649599ef5d48a339c4af7a26cd0ab", - "reference": "375d13cb828649599ef5d48a339c4af7a26cd0ab", + "url": "https://api.github.com/repos/thephpleague/container/zipball/ff346319ca1ff0e78277dc2311a42107cc1aab88", + "reference": "ff346319ca1ff0e78277dc2311a42107cc1aab88", "shasum": "" }, "require": { @@ -3469,7 +3531,7 @@ ], "support": { "issues": "https://github.com/thephpleague/container/issues", - "source": "https://github.com/thephpleague/container/tree/4.2.0" + "source": "https://github.com/thephpleague/container/tree/4.2.2" }, "funding": [ { @@ -3477,7 +3539,7 @@ "type": "github" } ], - "time": "2021-11-16T10:29:06+00:00" + "time": "2024-03-13T13:12:53+00:00" }, { "name": "masterminds/html5", @@ -3831,12 +3893,12 @@ "source": { "type": "git", "url": "https://github.com/pear/pear-core-minimal.git", - "reference": "d457b5c93e5001fbf4b5726d21038266e029e3be" + "reference": "ce0adade8b97561656ace07cdaac4751c271ea8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/d457b5c93e5001fbf4b5726d21038266e029e3be", - "reference": "d457b5c93e5001fbf4b5726d21038266e029e3be", + "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/ce0adade8b97561656ace07cdaac4751c271ea8c", + "reference": "ce0adade8b97561656ace07cdaac4751c271ea8c", "shasum": "" }, "require": { @@ -3872,7 +3934,7 @@ "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=PEAR", "source": "https://github.com/pear/pear-core-minimal" }, - "time": "2024-03-09T19:38:40+00:00" + "time": "2024-03-16T18:41:45+00:00" }, { "name": "pear/pear_exception", @@ -4453,16 +4515,16 @@ }, { "name": "psy/psysh", - "version": "v0.12.0", + "version": "v0.12.2", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "750bf031a48fd07c673dbe3f11f72362ea306d0d" + "reference": "9185c66c2165bbf4d71de78a69dccf4974f9538d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/750bf031a48fd07c673dbe3f11f72362ea306d0d", - "reference": "750bf031a48fd07c673dbe3f11f72362ea306d0d", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/9185c66c2165bbf4d71de78a69dccf4974f9538d", + "reference": "9185c66c2165bbf4d71de78a69dccf4974f9538d", "shasum": "" }, "require": { @@ -4526,9 +4588,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.12.0" + "source": "https://github.com/bobthecow/psysh/tree/v0.12.2" }, - "time": "2023-12-20T15:28:09+00:00" + "time": "2024-03-17T01:53:00+00:00" }, { "name": "ralouphie/getallheaders", @@ -7432,5 +7494,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/config/sync/core.entity_view_display.node.concept.default.yml b/config/sync/core.entity_view_display.node.concept.default.yml index f0faf1c..545104e 100644 --- a/config/sync/core.entity_view_display.node.concept.default.yml +++ b/config/sync/core.entity_view_display.node.concept.default.yml @@ -23,9 +23,9 @@ content: weight: 101 region: content content_moderation_control: - weight: -20 settings: { } third_party_settings: { } + weight: -20 region: content field_media: type: entity_reference_entity_view diff --git a/config/sync/core.entity_view_display.node.concept.teaser.yml b/config/sync/core.entity_view_display.node.concept.teaser.yml index 58e7bc4..66c79a4 100644 --- a/config/sync/core.entity_view_display.node.concept.teaser.yml +++ b/config/sync/core.entity_view_display.node.concept.teaser.yml @@ -25,9 +25,9 @@ content: weight: 101 region: content content_moderation_control: - weight: -20 settings: { } third_party_settings: { } + weight: -20 region: content links: settings: { } diff --git a/config/sync/core.entity_view_mode.node.diff.yml b/config/sync/core.entity_view_mode.node.diff.yml index df4242b..30adfa1 100644 --- a/config/sync/core.entity_view_mode.node.diff.yml +++ b/config/sync/core.entity_view_mode.node.diff.yml @@ -12,5 +12,6 @@ _core: default_config_hash: pqZNtad5J9THcdbYjwPD4qINqvrTxnOd8KCWn6tUBRs id: node.diff label: 'Revision comparison' +description: '' targetEntityType: node cache: true diff --git a/config/sync/views.view.zadnje_spremembe.yml b/config/sync/views.view.zadnje_spremembe.yml index 2551aad..661946c 100644 --- a/config/sync/views.view.zadnje_spremembe.yml +++ b/config/sync/views.view.zadnje_spremembe.yml @@ -5,6 +5,7 @@ dependencies: config: - node.type.concept module: + - content_moderation - node - user id: zadnje_spremembe @@ -100,6 +101,69 @@ display: multi_type: separator separator: ', ' field_api_classes: false + 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_field + label: Stanje + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + 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: content_moderation_state + 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 title: id: title table: node_field_revision @@ -285,17 +349,6 @@ display: granularity: second arguments: { } filters: - status: - id: status - table: node_field_revision - field: status - entity_type: node - entity_field: status - plugin_id: boolean - value: '1' - group: 1 - expose: - operator: '' type: id: type table: node_field_data -- 2.30.2 From f87710cecf2ca4010926b126278df4c0fb8d74a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jurij=20Podgor=C5=A1ek?= Date: Sun, 21 Apr 2024 19:29:06 +0200 Subject: [PATCH 4/8] Popravi cas revizije pri novem predlogu, popravki view zadnje spremembe, moderation info form --- README.md | 8 + composer.json | 4 + composer.lock | 47 ++- ...ck.block.olivero_moderationinfocontent.yml | 28 ++ ...ration_notification.spremembe_sprejete.yml | 2 +- config/sync/core.extension.yml | 1 + config/sync/views.view.zadnje_spremembe.yml | 310 +++++++++++++----- .../src/Plugin/rest/resource/AddConcept.php | 1 + 8 files changed, 310 insertions(+), 91 deletions(-) create mode 100644 config/sync/block.block.olivero_moderationinfocontent.yml diff --git a/README.md b/README.md index 7eb20ff..8516276 100644 --- a/README.md +++ b/README.md @@ -73,3 +73,11 @@ V modulu [yufu_concept](web/modules/custom/yufu_concept/yufu_concept.info.yml "y - ob novi publishani revizijami se poslje mail uporabniku, ki jo je naredil. Funkcionalnost se nahaja v yufu_admin modulu. + +# Debugging + +Razvojne kontejnerja lahko zlistamo z ukazom `ddev status` + +## Mejli + +Mailhog za debagiranje vklopimo, kot priporoči zgornji ukaz: `ddev launch -m` diff --git a/composer.json b/composer.json index 4c8ab69..c23173d 100644 --- a/composer.json +++ b/composer.json @@ -20,6 +20,7 @@ "drupal/cer": "^5.0@beta", "drupal/config_ignore": "^3.1", "drupal/content_as_config": "^1.0", + "drupal/content_moderation_info_block": "^2.0@beta", "drupal/content_moderation_notifications": "^3.6", "drupal/core-composer-scaffold": "^10.0", "drupal/core-project-message": "^10.0", @@ -55,6 +56,9 @@ "patches": { "drupal/restui": { "#3337894: Get class methods wrong argument.": "https://www.drupal.org/files/issues/2023-06-23/type-error-class-3337894-10.patch" + }, + "drupal/content_moderation_info_block": { + "#3185894: State Form Error": "https://www.drupal.org/files/issues/2023-10-11/3185894-state-form-error-12.patch" } }, "drupal-scaffold": { diff --git a/composer.lock b/composer.lock index d154b96..8ef82eb 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6fdae41d9930b076d636c871454e056b", + "content-hash": "6467965d60acc01165ed81a57e9cf9e9", "packages": [ { "name": "asm89/stack-cors", @@ -1726,6 +1726,50 @@ "issues": "https://www.drupal.org/project/issues/content_as_config" } }, + { + "name": "drupal/content_moderation_info_block", + "version": "2.0.0-beta1", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/content_moderation_info_block.git", + "reference": "2.0.0-beta1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/content_moderation_info_block-2.0.0-beta1.zip", + "reference": "2.0.0-beta1", + "shasum": "ffa5c2bf822414fe5c2287f49b1014861d6effc4" + }, + "require": { + "drupal/core": "^9 || ^10" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.0.0-beta1", + "datestamp": "1695972016", + "security-coverage": { + "status": "not-covered", + "message": "Project has not opted into security advisory coverage!" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "rp7", + "homepage": "https://www.drupal.org/user/219330" + } + ], + "description": "Provides a block that displays content moderation related info.", + "homepage": "https://www.drupal.org/project/content_moderation_info_block", + "support": { + "source": "https://git.drupalcode.org/project/content_moderation_info_block" + } + }, { "name": "drupal/content_moderation_notifications", "version": "3.6.0", @@ -7486,6 +7530,7 @@ "minimum-stability": "dev", "stability-flags": { "drupal/cer": 10, + "drupal/content_moderation_info_block": 10, "drupal/gin": 5, "drupal/gin_toolbar": 5, "drupal/yaml_content": 20 diff --git a/config/sync/block.block.olivero_moderationinfocontent.yml b/config/sync/block.block.olivero_moderationinfocontent.yml new file mode 100644 index 0000000..70d282e --- /dev/null +++ b/config/sync/block.block.olivero_moderationinfocontent.yml @@ -0,0 +1,28 @@ +uuid: 882a1fb8-dba5-4370-b1c4-fb8b5d46db4c +langcode: en +status: true +dependencies: + module: + - content_moderation_info_block + theme: + - olivero +id: olivero_moderationinfocontent +theme: olivero +region: content +weight: 0 +provider: null +plugin: 'content_moderation_info_block:node' +settings: + id: 'content_moderation_info_block:node' + label: 'Moderation info (Content)' + label_display: visible + provider: content_moderation_info_block + context_mapping: + entity: '@node.node_route_context:node' + changed_date_display: true + author_display: true + latest_revision_display: true + current_state_display: true + change_state_display: true + revision_log_message_input_display: false +visibility: { } diff --git a/config/sync/content_moderation_notifications.content_moderation_notification.spremembe_sprejete.yml b/config/sync/content_moderation_notifications.content_moderation_notification.spremembe_sprejete.yml index 537af79..6d86927 100644 --- a/config/sync/content_moderation_notifications.content_moderation_notification.spremembe_sprejete.yml +++ b/config/sync/content_moderation_notifications.content_moderation_notification.spremembe_sprejete.yml @@ -11,7 +11,7 @@ roles: author: true site_mail: false emails: '' -subject: '[YUFU] Changes approved' +subject: '[YUFU] Changes approved: [node:title]' body: value: 'Proposed changes to [node:title] ([node:url]) by [node:author:mail] were approved.' format: plain_text diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 9b657f6..da79082 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -14,6 +14,7 @@ module: config_translation: 0 content_as_config: 0 content_moderation: 0 + content_moderation_info_block: 0 content_moderation_notifications: 0 contextual: 0 datetime: 0 diff --git a/config/sync/views.view.zadnje_spremembe.yml b/config/sync/views.view.zadnje_spremembe.yml index 661946c..ad2d7b4 100644 --- a/config/sync/views.view.zadnje_spremembe.yml +++ b/config/sync/views.view.zadnje_spremembe.yml @@ -24,17 +24,17 @@ display: display_options: title: 'Zadnje spremembe' fields: - changed: - id: changed + title: + id: title table: node_field_revision - field: changed + field: title relationship: none group_type: group admin_label: '' entity_type: node - entity_field: changed + entity_field: title plugin_id: field - label: Čas + label: Pojem exclude: false alter: alter_text: false @@ -76,21 +76,9 @@ display: empty_zero: false hide_alter_empty: true click_sort_column: value - type: timestamp + type: string settings: - date_format: medium - custom_date_format: '' - timezone: '' - tooltip: - date_format: '' - custom_date_format: '' - time_diff: - enabled: false - future_format: '@interval hence' - past_format: '@interval ago' - granularity: 2 - refresh: 60 - description: '' + link_to_entity: true group_column: value group_columns: { } group_rows: true @@ -164,71 +152,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - title: - id: title - table: node_field_revision - field: title - relationship: none - group_type: group - admin_label: '' - entity_type: node - entity_field: title - plugin_id: field - label: Pojem - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: false - ellipsis: false - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - 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: string - settings: - link_to_entity: false - 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 revision_uid: id: revision_uid table: node_revision @@ -294,6 +217,215 @@ display: multi_type: separator separator: ', ' field_api_classes: false + revision_timestamp: + id: revision_timestamp + table: node_revision + field: revision_timestamp + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: revision_timestamp + plugin_id: field + label: 'Revision create time' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + 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: timestamp + settings: + date_format: short + custom_date_format: '' + timezone: '' + tooltip: + date_format: long + custom_date_format: '' + time_diff: + enabled: false + future_format: '@interval hence' + past_format: '@interval ago' + granularity: 2 + refresh: 60 + description: '' + 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 + vid_1: + id: vid_1 + table: node_field_revision + field: vid + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: vid + plugin_id: field + label: rID + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + 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: number_integer + settings: + thousand_separator: '' + prefix_suffix: true + 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 + nid: + id: nid + table: node_field_revision + field: nid + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: nid + plugin_id: field + label: nID + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + 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: number_integer + settings: + thousand_separator: '' + prefix_suffix: true + 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: @@ -331,15 +463,15 @@ display: options: { } empty: { } sorts: - changed: - id: changed - table: node_field_revision - field: changed + revision_timestamp: + id: revision_timestamp + table: node_revision + field: revision_timestamp relationship: none group_type: group admin_label: '' entity_type: node - entity_field: changed + entity_field: revision_timestamp plugin_id: date order: DESC expose: diff --git a/web/modules/custom/yufu_concept/src/Plugin/rest/resource/AddConcept.php b/web/modules/custom/yufu_concept/src/Plugin/rest/resource/AddConcept.php index dd8ad60..3a75ae5 100644 --- a/web/modules/custom/yufu_concept/src/Plugin/rest/resource/AddConcept.php +++ b/web/modules/custom/yufu_concept/src/Plugin/rest/resource/AddConcept.php @@ -121,6 +121,7 @@ class AddConcept extends ResourceBase { // Concept exists - create a new revision. $concept->setNewRevision(TRUE); $concept->setRevisionUserId($uid); + $concept->setRevisionCreationTime(\Drupal::time()->getRequestTime()); $concept->set('title', $data['title']); $concept->set('body', $data['text'] ?? $concept->body->value); if ($uid) { -- 2.30.2 From 1f5aaede91a357909d5bcd1e2e20f987b7820144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jurij=20Podgor=C5=A1ek?= Date: Sun, 21 Apr 2024 20:25:38 +0200 Subject: [PATCH 5/8] Nov block za (od)objavo revizije iz diff pogleda --- ...ck.block.olivero_moderationinfocontent.yml | 28 -- ....block.olivero_moderationinfocontent_2.yml | 28 ++ config/sync/views.view.zadnje_spremembe.yml | 336 +++++++++++------- .../Plugin/Block/ModerateFromDiffBlock.php | 64 ++++ .../custom/yufu_concept/yufu_concept.info.yml | 1 + 5 files changed, 294 insertions(+), 163 deletions(-) delete mode 100644 config/sync/block.block.olivero_moderationinfocontent.yml create mode 100644 config/sync/block.block.olivero_moderationinfocontent_2.yml create mode 100644 web/modules/custom/yufu_concept/src/Plugin/Block/ModerateFromDiffBlock.php diff --git a/config/sync/block.block.olivero_moderationinfocontent.yml b/config/sync/block.block.olivero_moderationinfocontent.yml deleted file mode 100644 index 70d282e..0000000 --- a/config/sync/block.block.olivero_moderationinfocontent.yml +++ /dev/null @@ -1,28 +0,0 @@ -uuid: 882a1fb8-dba5-4370-b1c4-fb8b5d46db4c -langcode: en -status: true -dependencies: - module: - - content_moderation_info_block - theme: - - olivero -id: olivero_moderationinfocontent -theme: olivero -region: content -weight: 0 -provider: null -plugin: 'content_moderation_info_block:node' -settings: - id: 'content_moderation_info_block:node' - label: 'Moderation info (Content)' - label_display: visible - provider: content_moderation_info_block - context_mapping: - entity: '@node.node_route_context:node' - changed_date_display: true - author_display: true - latest_revision_display: true - current_state_display: true - change_state_display: true - revision_log_message_input_display: false -visibility: { } diff --git a/config/sync/block.block.olivero_moderationinfocontent_2.yml b/config/sync/block.block.olivero_moderationinfocontent_2.yml new file mode 100644 index 0000000..6794ded --- /dev/null +++ b/config/sync/block.block.olivero_moderationinfocontent_2.yml @@ -0,0 +1,28 @@ +uuid: 2f782113-6263-4112-8cb9-f4de096fabda +langcode: en +status: true +dependencies: + module: + - yufu_concept + theme: + - olivero +id: olivero_moderationinfocontent_2 +theme: olivero +region: sidebar +weight: 0 +provider: null +plugin: 'yufu_concept_moderate_from_diff:node' +settings: + id: 'yufu_concept_moderate_from_diff:node' + label: 'YUFU Moderation info from diff (Content)' + label_display: visible + provider: yufu_concept + context_mapping: + entity: '@node.node_route_context:node' + changed_date_display: 1 + author_display: 1 + latest_revision_display: 1 + current_state_display: 1 + change_state_display: 1 + revision_log_message_input_display: 0 +visibility: { } diff --git a/config/sync/views.view.zadnje_spremembe.yml b/config/sync/views.view.zadnje_spremembe.yml index ad2d7b4..d0c740e 100644 --- a/config/sync/views.view.zadnje_spremembe.yml +++ b/config/sync/views.view.zadnje_spremembe.yml @@ -24,6 +24,204 @@ display: display_options: title: 'Zadnje spremembe' fields: + nid: + id: nid + table: node_field_revision + field: nid + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: nid + plugin_id: field + label: nID + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + 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: number_integer + settings: + thousand_separator: '' + prefix_suffix: true + 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 + vid_1: + id: vid_1 + table: node_field_revision + field: vid + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: vid + plugin_id: field + label: rID + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + 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: number_integer + settings: + thousand_separator: '' + prefix_suffix: true + 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 + vid: + id: vid + table: node_field_revision + field: vid + relationship: nid + group_type: group + admin_label: '' + entity_type: node + entity_field: vid + plugin_id: field + label: 'Latest Revision ID' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + 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: number_integer + settings: + thousand_separator: '' + prefix_suffix: true + 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 title: id: title table: node_field_revision @@ -39,8 +237,8 @@ display: alter: alter_text: false text: '' - make_link: false - path: '' + make_link: true + path: '/node/{{nid}}/revisions/view/{{vid}}/{{vid_1}}/visual_inline' absolute: false external: false replace_spaces: false @@ -78,7 +276,7 @@ display: click_sort_column: value type: string settings: - link_to_entity: true + link_to_entity: false group_column: value group_columns: { } group_rows: true @@ -294,138 +492,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - vid_1: - id: vid_1 - table: node_field_revision - field: vid - relationship: none - group_type: group - admin_label: '' - entity_type: node - entity_field: vid - plugin_id: field - label: rID - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - 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: number_integer - settings: - thousand_separator: '' - prefix_suffix: true - 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 - nid: - id: nid - table: node_field_revision - field: nid - relationship: none - group_type: group - admin_label: '' - entity_type: node - entity_field: nid - plugin_id: field - label: nID - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - 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: number_integer - settings: - thousand_separator: '' - prefix_suffix: true - 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: diff --git a/web/modules/custom/yufu_concept/src/Plugin/Block/ModerateFromDiffBlock.php b/web/modules/custom/yufu_concept/src/Plugin/Block/ModerateFromDiffBlock.php new file mode 100644 index 0000000..2523f1c --- /dev/null +++ b/web/modules/custom/yufu_concept/src/Plugin/Block/ModerateFromDiffBlock.php @@ -0,0 +1,64 @@ +getConfiguration(); + $entity = $this->getContextValue('entity'); + + $routeMatcher = \Drupal::service('current_route_match'); + + if ($routeMatcher->getRouteName() !== 'diff.revisions_diff') { + return []; + } + $revisionId = $routeMatcher->getParameter('right_revision'); + $revision = $this->entityTypeManager->getStorage('node')->loadRevision($revisionId); + + if (!$revision) { + return []; + } + + if ($configuration['change_state_display']) { + $class = NULL; + if ($this->moderationInfo->isModeratedEntity($revision)) { + $class = ContentModerationInfoBlockModerationForm::class; + } + elseif ($revision instanceof EntityPublishedInterface) { + $class = ContentModerationInfoBlockPublishForm::class; + } + + if ($class) { + $build['change_state'] = $this + ->formBuilder + ->getForm($class, $revision, $configuration['revision_log_message_input_display']); + } + } + + $build['#markup'] = 'Revision ID: ' . $revision->getRevisionId() + . 'Title: ' . $revision->getTitle(); + + return $build; + } +} diff --git a/web/modules/custom/yufu_concept/yufu_concept.info.yml b/web/modules/custom/yufu_concept/yufu_concept.info.yml index cfc664a..9bfd66c 100644 --- a/web/modules/custom/yufu_concept/yufu_concept.info.yml +++ b/web/modules/custom/yufu_concept/yufu_concept.info.yml @@ -5,3 +5,4 @@ package: Yufu core_version_requirement: ^9 || ^10 dependencies: - drupal:rest + - content_moderation_info_block:content_moderation_info_block -- 2.30.2 From a393a624fbf4687abfdadd583e5f596d25b91dcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jurij=20Podgor=C5=A1ek?= Date: Sun, 21 Apr 2024 20:36:24 +0200 Subject: [PATCH 6/8] Lepsi prikaz pri moderaciji, lapsus v prevodu --- .../sync/language/sl/views.view.moderated_content.yml | 11 +++-------- .../src/Plugin/Block/ModerateFromDiffBlock.php | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/config/sync/language/sl/views.view.moderated_content.yml b/config/sync/language/sl/views.view.moderated_content.yml index 2574aca..84479bd 100644 --- a/config/sync/language/sl/views.view.moderated_content.yml +++ b/config/sync/language/sl/views.view.moderated_content.yml @@ -7,8 +7,6 @@ display: fields: title: label: Naslov - type: - label: 'Tip vsebine' name: label: Avtor changed: @@ -18,17 +16,14 @@ display: exposed_form: options: submit_button: Počisti - reset_button_label: Poništi + reset_button_label: Ponastavi exposed_sorts_label: 'Rasporedi po' - sort_asc_label: Uzlazno - sort_desc_label: Silazno + sort_asc_label: Naraščajoče + sort_desc_label: Padajoče filters: title: expose: label: Naslov - type: - expose: - label: 'Tip vsebine' langcode: expose: label: Jezik diff --git a/web/modules/custom/yufu_concept/src/Plugin/Block/ModerateFromDiffBlock.php b/web/modules/custom/yufu_concept/src/Plugin/Block/ModerateFromDiffBlock.php index 2523f1c..e61af86 100644 --- a/web/modules/custom/yufu_concept/src/Plugin/Block/ModerateFromDiffBlock.php +++ b/web/modules/custom/yufu_concept/src/Plugin/Block/ModerateFromDiffBlock.php @@ -57,7 +57,7 @@ final class ModerateFromDiffBlock extends ContentModerationInfoBlock { } $build['#markup'] = 'Revision ID: ' . $revision->getRevisionId() - . 'Title: ' . $revision->getTitle(); + . '
Title: ' . $revision->getTitle(); return $build; } -- 2.30.2 From b7ece305f78c69eb7195ea25caad6eee12ca24da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jurij=20Podgor=C5=A1ek?= Date: Sun, 21 Apr 2024 20:37:33 +0200 Subject: [PATCH 7/8] Lapsus prevoda --- config/sync/views.view.content.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/sync/views.view.content.yml b/config/sync/views.view.content.yml index 9b9eb4c..06ec436 100644 --- a/config/sync/views.view.content.yml +++ b/config/sync/views.view.content.yml @@ -8,7 +8,7 @@ dependencies: _core: default_config_hash: 12Bd0mJQFIaXAkRfMVCAAcZ0oaxm94PoK8oHR9hkLmY id: content -label: Sadržaj +label: Vsebine module: node description: 'Find and manage content.' tag: default -- 2.30.2 From c51c571dd94a38637a229c37cd1bc9fada281756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jurij=20Podgor=C5=A1ek?= Date: Sun, 21 Apr 2024 21:00:20 +0200 Subject: [PATCH 8/8] =?UTF-8?q?=C4=8Ci=C5=A1=C4=8Denje?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yufu_concept/src/Plugin/Block/ModerateFromDiffBlock.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/modules/custom/yufu_concept/src/Plugin/Block/ModerateFromDiffBlock.php b/web/modules/custom/yufu_concept/src/Plugin/Block/ModerateFromDiffBlock.php index e61af86..06a9acd 100644 --- a/web/modules/custom/yufu_concept/src/Plugin/Block/ModerateFromDiffBlock.php +++ b/web/modules/custom/yufu_concept/src/Plugin/Block/ModerateFromDiffBlock.php @@ -4,7 +4,6 @@ declare(strict_types=1); namespace Drupal\yufu_concept\Plugin\Block; -use Drupal\Core\Block\BlockBase; use Drupal\content_moderation_info_block\Plugin\Block\ContentModerationInfoBlock; use Drupal\content_moderation_info_block\Form\ContentModerationInfoBlockModerationForm; use Drupal\content_moderation_info_block\Form\ContentModerationInfoBlockPublishForm; @@ -20,13 +19,13 @@ use Drupal\content_moderation_info_block\Form\ContentModerationInfoBlockPublishF * ) */ final class ModerateFromDiffBlock extends ContentModerationInfoBlock { + /** * {@inheritdoc} */ public function build() { $build = []; $configuration = $this->getConfiguration(); - $entity = $this->getContextValue('entity'); $routeMatcher = \Drupal::service('current_route_match'); -- 2.30.2