From da120f65def0764f59e543effade0e49666aff5e 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] Kazi tudi drafte, prikazi moderation state --- composer.lock | 242 +++++++++--------- ...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(+), 136 deletions(-) diff --git a/composer.lock b/composer.lock index ce6947e..3a865c2 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" @@ -2065,6 +2065,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", @@ -2158,17 +2217,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", @@ -2177,8 +2236,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." @@ -2455,26 +2514,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" @@ -2638,16 +2700,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": { @@ -2770,7 +2832,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": [ { @@ -2778,7 +2840,7 @@ "type": "github" } ], - "time": "2024-03-02T12:14:56+00:00" + "time": "2024-03-20T15:03:27+00:00" }, { "name": "egulias/email-validator", @@ -2847,72 +2909,6 @@ ], "time": "2023-10-06T06:47:41+00:00" }, - { - "name": "enlightn/security-checker", - "version": "v1.11.0", - "source": { - "type": "git", - "url": "https://github.com/enlightn/security-checker.git", - "reference": "68df5c7256c84b428bf8fcff0d249de06ce362d2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/enlightn/security-checker/zipball/68df5c7256c84b428bf8fcff0d249de06ce362d2", - "reference": "68df5c7256c84b428bf8fcff0d249de06ce362d2", - "shasum": "" - }, - "require": { - "ext-json": "*", - "guzzlehttp/guzzle": "^6.3|^7.0", - "php": ">=5.6", - "symfony/console": "^3.4|^4|^5|^6|^7", - "symfony/finder": "^3|^4|^5|^6|^7", - "symfony/process": "^3.4|^4|^5|^6|^7", - "symfony/yaml": "^3.4|^4|^5|^6|^7" - }, - "require-dev": { - "ext-zip": "*", - "friendsofphp/php-cs-fixer": "^2.18|^3.0", - "phpunit/phpunit": "^5.5|^6|^7|^8|^9" - }, - "bin": [ - "security-checker" - ], - "type": "library", - "autoload": { - "psr-4": { - "Enlightn\\SecurityChecker\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Paras Malhotra", - "email": "paras@laravel-enlightn.com" - }, - { - "name": "Miguel Piedrafita", - "email": "soy@miguelpiedrafita.com" - } - ], - "description": "A PHP dependency vulnerabilities scanner based on the Security Advisories Database.", - "keywords": [ - "package", - "php", - "scanner", - "security", - "security advisories", - "vulnerability scanner" - ], - "support": { - "issues": "https://github.com/enlightn/security-checker/issues", - "source": "https://github.com/enlightn/security-checker/tree/v1.11.0" - }, - "time": "2023-11-17T07:53:29+00:00" - }, { "name": "ezyang/htmlpurifier", "version": "v4.17.0", @@ -3409,16 +3405,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": { @@ -3479,7 +3475,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": [ { @@ -3487,7 +3483,7 @@ "type": "github" } ], - "time": "2021-11-16T10:29:06+00:00" + "time": "2024-03-13T13:12:53+00:00" }, { "name": "masterminds/html5", @@ -3841,12 +3837,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": { @@ -3882,7 +3878,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", @@ -4463,16 +4459,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": { @@ -4536,9 +4532,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", @@ -7442,5 +7438,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