Add: Allow simple version management commands from the page tree indicator drop down menus #295

fsbraun · 2022-10-29T14:28:19Z

Description

This pr adds the capability to monkey patch the page trees indicator menu allowing to publish, unpublish, and revert from the page tree.

This PR is draft and open points remain to be done

Manage redirections after publish/unpublish correctly
Decide on additional state (draft, ring primary color). In v3 unpublished and draft were the same. In v4, reverting an unpublished version leads to a new draft.
Disable edit pageconsent if not a draft
Decide on immediate unpublish/revert (and not first ask for confirmation).
Keep an open side frame open when publishing/unpublishing (currently unclear why it closes)
Add tests

Related resources

feat: [CMS v4] Reintroduce indicator menus django-cms#7426 is prerequisite or no menus to patch are available (silently skipped)
#...

Review guide

monkeypatch/indicators.py: Indicator logic, patching into classy template tags. Since template tags are called multiple times, versioning results are cached
monkeypatch/templatetags.py: Backward compatibility: Patches function-based tags (v4.0....) or class-based tags (v4.1....)
cms_toolbar.py: Show edit button only if edit is possible (otherwise clicking produces an error), show revert button if viewing archive or unpublished version
Tests are commented

Checklist

I have opened this pull request against master
I have added or modified the tests when changing logic
I have followed the conventional commits guidelines to add meaningful information into the changelog
I have read the contribution guidelines and I have joined #workgroup-pr-review on
Slack to find a “pr review buddy” who is going to review my pull request.

codecov · 2022-10-29T16:44:56Z

Codecov Report

Merging #295 (ed3e907) into master (fedd956) will increase coverage by 0.00%.
The diff coverage is 82.00%.

❗ Current head ed3e907 differs from pull request most recent head 58222a9. Consider uploading reports for the commit 58222a9 to get more accurate results

@@           Coverage Diff           @@
##           master     #295   +/-   ##
=======================================
  Coverage   85.17%   85.17%           
=======================================
  Files          23       24    +1     
  Lines         843      931   +88     
  Branches      118      141   +23     
=======================================
+ Hits          718      793   +75     
- Misses        100      108    +8     
- Partials       25       30    +5

Impacted Files	Coverage Δ
djangocms_versioning/monkeypatch/templatetags.py	`58.82% <50.00%> (+5.88%)`	⬆️
djangocms_versioning/indicators.py	`80.00% <80.00%> (ø)`
djangocms_versioning/cms_toolbars.py	`95.70% <93.10%> (-0.01%)`	⬇️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Add: Patch edit pagecontent only for draft versions

Add: Revert button for unpublished versions

lgtm-com · 2022-10-30T19:14:59Z

This pull request introduces 1 alert when merging 500f79f into e6a33ea - view on LGTM.com

new alerts:

1 for Unused import

marksweb · 2022-10-31T18:48:21Z

Like the look of this. Will have to try it out 👍

fsbraun · 2022-10-31T19:45:24Z

@marksweb Only works together with django-cms/django-cms#7426 (gulp sass && gulp bundle for the full experience...)

Add: Delete draft menu entry for pagecontents tree

…can_be_...` methods.

djangocms_versioning/indicators.py

lgtm-com · 2022-12-03T15:04:28Z

This pull request introduces 1 alert when merging bfcb5d9 into 84c063d - view on LGTM.com

new alerts:

1 for Information exposure through an exception

Heads-up: LGTM.com's PR analysis will be disabled on the 5th of December, and LGTM.com will be shut down ⏻ completely on the 16th of December 2022. It looks like GitHub code scanning with CodeQL is already set up for this repo, so no further action is needed 🚀. For more information, please check out our post on the GitHub blog.

djangocms_versioning/cms_config.py

+            version.check_modify(request.user)
+        except ConditionFailed as e:
+            self.message_user(request, force_str(e), messages.ERROR)
+            return HttpResponseForbidden(force_str(e))


lgtm-com · 2022-12-03T23:01:30Z

This pull request introduces 2 alerts when merging 1311e81 into 84c063d - view on LGTM.com

new alerts:

1 for Unused import
1 for Information exposure through an exception

Heads-up: LGTM.com's PR analysis will be disabled on the 5th of December, and LGTM.com will be shut down ⏻ completely on the 16th of December 2022. It looks like GitHub code scanning with CodeQL is already set up for this repo, so no further action is needed 🚀. For more information, please check out our post on the GitHub blog.

lgtm-com · 2022-12-04T00:21:14Z

This pull request introduces 1 alert when merging 4a029e2 into 84c063d - view on LGTM.com

new alerts:

1 for Information exposure through an exception

Heads-up: LGTM.com's PR analysis will be disabled on the 5th of December, and LGTM.com will be shut down ⏻ completely on the 16th of December 2022. It looks like GitHub code scanning with CodeQL is already set up for this repo, so no further action is needed 🚀. For more information, please check out our post on the GitHub blog.

lgtm-com · 2022-12-04T00:42:03Z

This pull request introduces 1 alert when merging ed3e907 into 84c063d - view on LGTM.com

new alerts:

1 for Information exposure through an exception

Heads-up: LGTM.com's PR analysis will be disabled on the 5th of December, and LGTM.com will be shut down ⏻ completely on the 16th of December 2022. It looks like GitHub code scanning with CodeQL is already set up for this repo, so no further action is needed 🚀. For more information, please check out our post on the GitHub blog.

lgtm-com · 2022-12-07T15:48:59Z

This pull request introduces 1 alert when merging 58222a9 into fedd956 - view on LGTM.com

new alerts:

1 for Information exposure through an exception

Heads-up: LGTM.com's PR analysis will be disabled on the 5th of December, and LGTM.com will be shut down ⏻ completely on the 16th of December 2022. It looks like GitHub code scanning with CodeQL is already set up for this repo, so no further action is needed 🚀. For more information, please check out our post on the GitHub blog.

Add: Ability to patch new page tree indicator drop down menus

fbe1bd8

fsbraun marked this pull request as draft October 29, 2022 14:28

fsbraun added 3 commits October 29, 2022 16:33

Fix: isort, flake8

6124d45

adj toolbar tests to reflect unified spelling

5689c4c

Fix: Catch cms.pagetree.js` ajax posts

d3bafb5

fsbraun added 4 commits October 30, 2022 15:33

Add: Indicator status draft

41977d0

Add: Patch edit pagecontent only for draft versions

Fix: Only offer to copy plugins from languages that allow for that

7155c09

Fix: Edit button only if it is needed

85a0504

Add: Revert button for unpublished versions

Add: changelog entry

500f79f

fsbraun added 7 commits October 30, 2022 20:18

Fix: tests

f7cf4d7

Fix: Remove jsonresponse

703c4bf

udo admin changes

0b326d2

Refactor template tag patch

15e2d37

Add: tests for publishand revert button

a55d978

Add: tests

9b8f73e

fix: isort

2613f1e

fsbraun marked this pull request as ready for review October 31, 2022 18:04

marksweb approved these changes Nov 1, 2022

View reviewed changes

fsbraun added 8 commits November 2, 2022 09:23

Fix: spelling

7508ecb

Add: Delete draft menu entry for pagecontents tree

Fix isort

f90e7f8

Add: test w/ archived versions

aa2efe5

Fix: Use logic from Contitions() to not repeat oneself

0bf013c

flake8

9d41f94

Add: # pragma: no cover to cases without page content

bee5acd

Removed unused method add_revert_button

02552e8

Fix: typo

9a01fc6

fsbraun added 3 commits November 3, 2022 09:01

Fix: ensure get_absolute_url is s property of versionable object

69c9167

Fix: Sync indicator items and versioning admin actions according to `…

a268ef3

…can_be_...` methods.

Refactor: No patching

6307e1d

github-advanced-security bot found potential problems Nov 24, 2022

View reviewed changes

djangocms_versioning/indicators.py Fixed Show fixed Hide fixed

fsbraun added 10 commits November 24, 2022 17:13

Fix: isort

de6a135

Undo: Make version number column smaller

405ae39

Merge branch 'master' into feat/stateIndicators

b42087a

Merge branch 'master' into feat/stateIndicators

da14fe0

Fix merge, isort

83e4580

FiX: remove revert from archive and add compare to published

a7103ea

feat: add configurable back button

1702d55

Fix linter problems

681e566

Fix: order of compared versions in toolbar menu

f5d6fa4

Fix: Add check for in navigation toggle

bfcb5d9

github-advanced-security bot found potential problems Dec 3, 2022

View reviewed changes

unify icons

1311e81

fsbraun added 2 commits December 4, 2022 01:08

fix import

2528843

add users to request in tests

4a029e2

fix: no double edit option

ed3e907

Merge branch 'master' into feat/stateIndicators

58222a9

fsbraun changed the title ~~Add: Ability to patch new page tree indicator drop down menus~~ Add: Allow simple version management commands from the page tree indicator drop down menus Dec 7, 2022

Aiky30 approved these changes Dec 8, 2022

View reviewed changes

fsbraun merged commit 4e5b1c4 into django-cms:master Dec 8, 2022

fsbraun mentioned this pull request Dec 15, 2022

feat: Use same icons in page tree state indicators and Manage verisons #302

Merged

4 tasks

fsbraun deleted the feat/stateIndicators branch January 23, 2023 16:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add: Allow simple version management commands from the page tree indicator drop down menus #295

Add: Allow simple version management commands from the page tree indicator drop down menus #295

Uh oh!

fsbraun commented Oct 29, 2022 •

edited

Loading

Uh oh!

codecov bot commented Oct 29, 2022 •

edited

Loading

Uh oh!

lgtm-com bot commented Oct 30, 2022

Uh oh!

marksweb commented Oct 31, 2022

Uh oh!

fsbraun commented Oct 31, 2022 •

edited

Loading

Uh oh!

Uh oh!

lgtm-com bot commented Dec 3, 2022

Uh oh!

Check warning

lgtm-com bot commented Dec 3, 2022

Uh oh!

lgtm-com bot commented Dec 4, 2022

Uh oh!

lgtm-com bot commented Dec 4, 2022

Uh oh!

lgtm-com bot commented Dec 7, 2022

Uh oh!

Uh oh!

Add: Allow simple version management commands from the page tree indicator drop down menus #295

Add: Allow simple version management commands from the page tree indicator drop down menus #295

Uh oh!

Conversation

fsbraun commented Oct 29, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Related resources

Review guide

Checklist

Uh oh!

codecov bot commented Oct 29, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

lgtm-com bot commented Oct 30, 2022

Uh oh!

marksweb commented Oct 31, 2022

Uh oh!

fsbraun commented Oct 31, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

lgtm-com bot commented Dec 3, 2022

Uh oh!

Check warning

lgtm-com bot commented Dec 3, 2022

Uh oh!

lgtm-com bot commented Dec 4, 2022

Uh oh!

lgtm-com bot commented Dec 4, 2022

Uh oh!

lgtm-com bot commented Dec 7, 2022

Uh oh!

Uh oh!

fsbraun commented Oct 29, 2022 •

edited

Loading

codecov bot commented Oct 29, 2022 •

edited

Loading

fsbraun commented Oct 31, 2022 •

edited

Loading