diff --git a/src/bundle/Controller/Content/VersionDraftConflictController.php b/src/bundle/Controller/Content/VersionDraftConflictController.php index 6c50cedb..598367fe 100644 --- a/src/bundle/Controller/Content/VersionDraftConflictController.php +++ b/src/bundle/Controller/Content/VersionDraftConflictController.php @@ -10,7 +10,9 @@ namespace EzSystems\EzPlatformAdminUiBundle\Controller\Content; use eZ\Publish\API\Repository\ContentService; use eZ\Publish\API\Repository\LocationService; +use eZ\Publish\API\Repository\UserService; use EzSystems\EzPlatformAdminUi\Specification\Content\ContentDraftHasConflict; +use EzSystems\EzPlatformAdminUi\Specification\ContentIsUser; use EzSystems\EzPlatformAdminUi\UI\Dataset\DatasetFactory; use EzSystems\EzPlatformAdminUiBundle\Controller\Controller; use Symfony\Component\HttpFoundation\Response; @@ -26,19 +28,25 @@ class VersionDraftConflictController extends Controller /** @var DatasetFactory */ private $datasetFactory; + /** @var \eZ\Publish\API\Repository\UserService */ + private $userService; + /** - * @param LocationService $locationService - * @param ContentService $contentService - * @param DatasetFactory $datasetFactory + * @param \eZ\Publish\API\Repository\LocationService $locationService + * @param \eZ\Publish\API\Repository\ContentService $contentService + * @param \EzSystems\EzPlatformAdminUi\UI\Dataset\DatasetFactory $datasetFactory + * @param \eZ\Publish\API\Repository\UserService $userService */ public function __construct( LocationService $locationService, ContentService $contentService, - DatasetFactory $datasetFactory + DatasetFactory $datasetFactory, + UserService $userService ) { $this->locationService = $locationService; $this->contentService = $contentService; $this->datasetFactory = $datasetFactory; + $this->userService = $userService; } /** @@ -68,6 +76,7 @@ class VersionDraftConflictController extends Controller $modalContent = $this->renderView('@ezdesign/content/modal_draft_conflict.html.twig', [ 'conflicted_drafts' => $conflictedDrafts, 'location' => $location, + 'content_is_user' => (new ContentIsUser($this->userService))->isSatisfiedBy($content), ]); return new Response($modalContent, Response::HTTP_CONFLICT); diff --git a/src/bundle/Controller/ContentController.php b/src/bundle/Controller/ContentController.php index 27058be5..84c23808 100644 --- a/src/bundle/Controller/ContentController.php +++ b/src/bundle/Controller/ContentController.php @@ -10,6 +10,7 @@ use eZ\Publish\API\Repository\ContentService; use eZ\Publish\API\Repository\Exceptions as ApiException; use eZ\Publish\API\Repository\Exceptions\UnauthorizedException; use eZ\Publish\API\Repository\LocationService; +use eZ\Publish\API\Repository\UserService; use eZ\Publish\API\Repository\Values\Content\Content; use eZ\Publish\API\Repository\Values\Content\Location; use eZ\Publish\Core\Base\Exceptions\BadStateException; @@ -22,6 +23,8 @@ use EzSystems\EzPlatformAdminUi\Form\Factory\FormFactory; use EzSystems\EzPlatformAdminUi\Form\SubmitHandler; use EzSystems\EzPlatformAdminUi\Notification\NotificationHandlerInterface; use EzSystems\EzPlatformAdminUi\Siteaccess\SiteaccessResolverInterface; +use EzSystems\EzPlatformAdminUi\Specification\ContentIsUser; +use EzSystems\EzPlatformAdminUi\Specification\ContentType\ContentTypeIsUser; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -57,15 +60,23 @@ class ContentController extends Controller /** @var LocationService */ private $locationService; + /** @var \eZ\Publish\API\Repository\UserService */ + private $userService; + + /** @var array */ + private $userContentTypeIdentifier; + /** - * @param NotificationHandlerInterface $notificationHandler - * @param ContentService $contentService - * @param FormFactory $formFactory - * @param SubmitHandler $submitHandler - * @param TranslatorInterface $translator - * @param ContentMainLocationUpdateMapper $contentMetadataUpdateMapper - * @param SiteaccessResolverInterface $siteaccessResolver - * @param LocationService $locationService + * @param \EzSystems\EzPlatformAdminUi\Notification\NotificationHandlerInterface $notificationHandler + * @param \eZ\Publish\API\Repository\ContentService $contentService + * @param \EzSystems\EzPlatformAdminUi\Form\Factory\FormFactory $formFactory + * @param \EzSystems\EzPlatformAdminUi\Form\SubmitHandler $submitHandler + * @param \Symfony\Component\Translation\TranslatorInterface $translator + * @param \EzSystems\EzPlatformAdminUi\Form\DataMapper\ContentMainLocationUpdateMapper $contentMetadataUpdateMapper + * @param \EzSystems\EzPlatformAdminUi\Siteaccess\SiteaccessResolverInterface $siteaccessResolver + * @param \eZ\Publish\API\Repository\LocationService $locationService + * @param \eZ\Publish\API\Repository\UserService $userService + * @param array $userContentTypeIdentifier */ public function __construct( NotificationHandlerInterface $notificationHandler, @@ -75,7 +86,9 @@ class ContentController extends Controller TranslatorInterface $translator, ContentMainLocationUpdateMapper $contentMetadataUpdateMapper, SiteaccessResolverInterface $siteaccessResolver, - LocationService $locationService + LocationService $locationService, + UserService $userService, + array $userContentTypeIdentifier ) { $this->notificationHandler = $notificationHandler; $this->contentService = $contentService; @@ -85,6 +98,8 @@ class ContentController extends Controller $this->contentMainLocationUpdateMapper = $contentMetadataUpdateMapper; $this->siteaccessResolver = $siteaccessResolver; $this->locationService = $locationService; + $this->userService = $userService; + $this->userContentTypeIdentifier = $userContentTypeIdentifier; } /** @@ -110,6 +125,14 @@ class ContentController extends Controller $language = $data->getLanguage(); $parentLocation = $data->getParentLocation(); + if ((new ContentTypeIsUser($this->userContentTypeIdentifier))->isSatisfiedBy($contentType)) { + return $this->redirectToRoute('ez_user_create', [ + 'contentTypeIdentifier' => $contentType->identifier, + 'language' => $language->languageCode, + 'parentLocationId' => $parentLocation->id, + ]); + } + return $this->redirectToRoute('ez_content_create_no_draft', [ 'contentTypeIdentifier' => $contentType->identifier, 'language' => $language->languageCode, @@ -151,6 +174,15 @@ class ContentController extends Controller $versionNo = $versionInfo->versionNo; $location = $data->getLocation(); + $content = $this->contentService->loadContent($contentInfo->id); + if ((new ContentIsUser($this->userService))->isSatisfiedBy($content)) { + return $this->redirectToRoute('ez_user_update', [ + 'contentId' => $contentInfo->id, + 'versionNo' => $versionNo, + 'language' => $language->languageCode, + ]); + } + if (!$versionInfo->isDraft()) { $contentDraft = $this->contentService->createContentDraft($contentInfo, $versionInfo); $versionNo = $contentDraft->getVersionInfo()->versionNo; diff --git a/src/bundle/Controller/ContentViewController.php b/src/bundle/Controller/ContentViewController.php index 0edf0d15..63d51efa 100644 --- a/src/bundle/Controller/ContentViewController.php +++ b/src/bundle/Controller/ContentViewController.php @@ -21,6 +21,7 @@ use EzSystems\EzPlatformAdminUi\Form\Data\Location\LocationCopySubtreeData; use EzSystems\EzPlatformAdminUi\Form\Data\Location\LocationMoveData; use EzSystems\EzPlatformAdminUi\Form\Data\Location\LocationTrashData; use EzSystems\EzPlatformAdminUi\Form\Data\User\UserDeleteData; +use EzSystems\EzPlatformAdminUi\Form\Data\User\UserEditData; use EzSystems\EzPlatformAdminUi\Form\Factory\FormFactory; use EzSystems\EzPlatformAdminUi\Specification\ContentIsUser; use EzSystems\EzPlatformAdminUi\UI\Module\Subitems\ContentViewParameterSupplier as SubitemsContentViewParameterSupplier; @@ -208,10 +209,6 @@ class ContentViewController extends Controller new LocationMoveData($location) ); - $contentEditType = $this->formFactory->contentEdit( - new ContentEditData($content->contentInfo, $versionInfo, null, $location) - ); - $subitemsContentEdit = $this->formFactory->contentEdit( null, 'form_subitems_content_edit' @@ -228,7 +225,6 @@ class ContentViewController extends Controller $view->addParameters([ 'form_location_copy' => $locationCopyType->createView(), 'form_location_move' => $locationMoveType->createView(), - 'form_content_edit' => $contentEditType->createView(), 'form_content_create' => $contentCreateType->createView(), 'form_subitems_content_edit' => $subitemsContentEdit->createView(), 'form_location_copy_subtree' => $locationCopySubtreeType->createView(), @@ -238,17 +234,25 @@ class ContentViewController extends Controller $userDeleteType = $this->formFactory->deleteUser( new UserDeleteData($content->contentInfo) ); + $userEditType = $this->formFactory->editUser( + new UserEditData($content->contentInfo, $versionInfo, null, $location) + ); $view->addParameters([ 'form_user_delete' => $userDeleteType->createView(), + 'form_user_edit' => $userEditType->createView(), ]); } else { $locationTrashType = $this->formFactory->trashLocation( new LocationTrashData($location) ); + $contentEditType = $this->formFactory->contentEdit( + new ContentEditData($content->contentInfo, $versionInfo, null, $location) + ); $view->addParameters([ 'form_location_trash' => $locationTrashType->createView(), + 'form_content_edit' => $contentEditType->createView(), ]); } } diff --git a/src/bundle/Resources/config/services/controllers.yml b/src/bundle/Resources/config/services/controllers.yml index 8a4b43fc..9a0cc0bb 100644 --- a/src/bundle/Resources/config/services/controllers.yml +++ b/src/bundle/Resources/config/services/controllers.yml @@ -8,6 +8,7 @@ services: parent: EzSystems\EzPlatformAdminUiBundle\Controller\Controller arguments: $siteaccessResolver: '@EzSystems\EzPlatformAdminUi\Siteaccess\NonAdminSiteaccessResolver' + $userContentTypeIdentifier: '$user_content_type_identifier$' EzSystems\EzPlatformAdminUiBundle\Controller\ContentTypeController: parent: EzSystems\EzPlatformAdminUiBundle\Controller\Controller diff --git a/src/bundle/Resources/public/js/scripts/admin.location.view.js b/src/bundle/Resources/public/js/scripts/admin.location.view.js index 5df35225..eb413078 100644 --- a/src/bundle/Resources/public/js/scripts/admin.location.view.js +++ b/src/bundle/Resources/public/js/scripts/admin.location.view.js @@ -36,7 +36,10 @@ const wrapper = doc.querySelector('.ez-modal-wrapper'); wrapper.innerHTML = modalHtml; - wrapper.querySelector('.ez-btn--add-draft').addEventListener('click', addDraft, false); + const addDraftButton = wrapper.querySelector('.ez-btn--add-draft'); + if (addDraftButton) { + addDraftButton.addEventListener('click', addDraft, false); + } [...wrapper.querySelectorAll('.ez-btn--prevented')].forEach(btn => btn.addEventListener('click', event => event.preventDefault(), false)); $('#version-draft-conflict-modal').modal('show'); }; diff --git a/src/bundle/Resources/public/js/scripts/button.content.edit.js b/src/bundle/Resources/public/js/scripts/button.content.edit.js index 9fbe6e05..30496530 100644 --- a/src/bundle/Resources/public/js/scripts/button.content.edit.js +++ b/src/bundle/Resources/public/js/scripts/button.content.edit.js @@ -26,7 +26,10 @@ const wrapper = doc.querySelector('.ez-modal-wrapper'); wrapper.innerHTML = modalHtml; - wrapper.querySelector('.ez-btn--add-draft').addEventListener('click', addDraft, false); + const addDraftButton = wrapper.querySelector('.ez-btn--add-draft'); + if (addDraftButton) { + addDraftButton.addEventListener('click', addDraft, false); + } [...wrapper.querySelectorAll('.ez-btn--prevented')].forEach(btn => btn.addEventListener('click', event => event.preventDefault(), false)); $('#version-draft-conflict-modal').modal('show'); }; diff --git a/src/bundle/Resources/public/js/scripts/sidebar/btn/location.edit.js b/src/bundle/Resources/public/js/scripts/sidebar/btn/location.edit.js index ab64eca9..bf043967 100644 --- a/src/bundle/Resources/public/js/scripts/sidebar/btn/location.edit.js +++ b/src/bundle/Resources/public/js/scripts/sidebar/btn/location.edit.js @@ -1,8 +1,9 @@ (function (global, doc, $) { - const editActions = doc.querySelector('.ez-extra-actions--edit'); + const editActions = doc.querySelector('.ez-extra-actions--edit') || doc.querySelector('.ez-extra-actions--edit-user') ; const btns = [...editActions.querySelectorAll('.form-check [type="radio"]')]; const form = editActions.querySelector('form'); - const contentId = form.querySelector('#content_edit_content_info').value; + const contentIdInput = form.querySelector('#content_edit_content_info') || form.querySelector('#user_edit_content_info'); + const contentId = contentIdInput.value; const checkVersionDraftLink = global.Routing.generate('ezplatform.version_draft.has_no_conflict', { contentId }); const resetRadioButtons = () => btns.forEach(btn => btn.checked = false); const addDraft = () => { @@ -14,17 +15,31 @@ const showModal = (modalHtml) => { const wrapper = doc.querySelector('.ez-modal-wrapper'); wrapper.innerHTML = modalHtml; - wrapper.querySelector('.ez-btn--add-draft').addEventListener('click', addDraft, false); + const addDraftButton = wrapper.querySelector('.ez-btn--add-draft'); + if (addDraftButton) { + addDraftButton.addEventListener('click', addDraft, false); + } [...wrapper.querySelectorAll('.ez-btn--prevented')].forEach(btn => btn.addEventListener('click', event => event.preventDefault(), false)); $('#version-draft-conflict-modal').modal('show').on('hidden.bs.modal', resetRadioButtons); }; + const redirectToUserEdit = () => { + const versionNo = form.querySelector('#user_edit_version_info_version_no').value; + const language = btns.find(btn => btn.checked).value; + + window.location.href = global.Routing.generate('ez_user_update', { contentId, versionNo, language }); + }; + fetch(checkVersionDraftLink, { credentials: 'same-origin' }).then(function (response) { if (response.status === 409) { response.text().then(showModal); } else if (response.status === 200) { + if (form.querySelector('#user_edit_version_info')) { + redirectToUserEdit(); + return; + } form.submit(); } }); diff --git a/src/bundle/Resources/public/js/scripts/sidebar/btn/user.edit.js b/src/bundle/Resources/public/js/scripts/sidebar/btn/user.edit.js new file mode 100644 index 00000000..fde3c126 --- /dev/null +++ b/src/bundle/Resources/public/js/scripts/sidebar/btn/user.edit.js @@ -0,0 +1,14 @@ +(function (global, doc) { + const editButton = doc.querySelector('.ez-btn--edit-user'); + const languageRadioOption = doc.querySelector('.ez-extra-actions--edit-user.ez-extra-actions--prevent-show [type="radio"]'); + const editActions = doc.querySelector('.ez-extra-actions--edit-user'); + + if (!editActions || !languageRadioOption) { + return; + } + + editButton.addEventListener('click', () => { + languageRadioOption.checked = true; + languageRadioOption.dispatchEvent(new CustomEvent('change')); + }, false); +})(window, document); diff --git a/src/bundle/Resources/public/scss/_extra-actions.scss b/src/bundle/Resources/public/scss/_extra-actions.scss index db087186..243e7553 100644 --- a/src/bundle/Resources/public/scss/_extra-actions.scss +++ b/src/bundle/Resources/public/scss/_extra-actions.scss @@ -54,6 +54,7 @@ overflow: auto; } + &--edit-user, &--edit { #{$block}__content { padding: 8px; diff --git a/src/bundle/Resources/translations/content_url.en.xliff b/src/bundle/Resources/translations/content_url.en.xliff index c1a7523c..3cd7b345 100644 --- a/src/bundle/Resources/translations/content_url.en.xliff +++ b/src/bundle/Resources/translations/content_url.en.xliff @@ -56,6 +56,11 @@ Checked will create the alias at the site root. key: tab.urls.add.site_root.helper.checked + + Unchecked will create the new alias under the parent of this location + Unchecked will create the new alias under the parent of this location + key: tab.urls.add.site_root.helper.no_parent_name + Unchecked will create the new alias under %parent_name% Unchecked will create the new alias under %parent_name% diff --git a/src/bundle/Resources/translations/draft_conflict.en.xliff b/src/bundle/Resources/translations/draft_conflict.en.xliff index 1b5ad870..c8ce37e3 100644 --- a/src/bundle/Resources/translations/draft_conflict.en.xliff +++ b/src/bundle/Resources/translations/draft_conflict.en.xliff @@ -11,6 +11,11 @@ You can either edit any of your existing draft(s) or add a new one. key: draft.conflict.choice + + You can edit any of your existing draft(s) + You can edit any of your existing draft(s) + key: draft.conflict.choice_content_is_user + Draft conflict when editing Draft conflict when editing diff --git a/src/bundle/Resources/translations/locationview.en.xliff b/src/bundle/Resources/translations/locationview.en.xliff index 8a6f955a..8a41eb7e 100644 --- a/src/bundle/Resources/translations/locationview.en.xliff +++ b/src/bundle/Resources/translations/locationview.en.xliff @@ -456,6 +456,11 @@ Close key: translation.modal_close + + Select language + Select language + key: user.edit.select_language + diff --git a/src/bundle/Resources/views/content/locationview.html.twig b/src/bundle/Resources/views/content/locationview.html.twig index 25bde37d..63dac31a 100644 --- a/src/bundle/Resources/views/content/locationview.html.twig +++ b/src/bundle/Resources/views/content/locationview.html.twig @@ -3,7 +3,12 @@ {% trans_default_domain 'locationview' %} {% form_theme form_location_copy '@ezdesign/parts/form/flat_widgets.html.twig' %} {% form_theme form_location_move '@ezdesign/parts/form/flat_widgets.html.twig' %} -{% form_theme form_content_edit '@ezdesign/form_fields.html.twig' %} +{% if form_content_edit is defined %} + {% form_theme form_content_edit '@ezdesign/form_fields.html.twig' %} +{% endif %} +{% if form_user_edit is defined %} + {% form_theme form_user_edit '@ezdesign/form_fields.html.twig' %} +{% endif %} {% form_theme form_content_create '@ezdesign/form_fields.html.twig' %} {% block body_class %}ez-content-view{% endblock %} @@ -75,7 +80,12 @@
{% include '@ezdesign/content/widgets/content_create.html.twig' with {'form': form_content_create} only %} - {% include '@ezdesign/content/widgets/content_edit.html.twig' with {'form': form_content_edit} only %} + {% if form_content_edit is defined %} + {% include '@ezdesign/content/widgets/content_edit.html.twig' with {'form': form_content_edit} only %} + {% endif %} + {% if form_user_edit is defined %} + {% include '@ezdesign/content/widgets/user_edit.html.twig' with {'form': form_user_edit} only %} + {% endif %}
{% if form_location_trash is defined %} @@ -124,6 +134,7 @@ '@EzPlatformAdminUiBundle/Resources/public/js/scripts/udw/locations.tab.js' '@EzPlatformAdminUiBundle/Resources/public/js/scripts/sidebar/extra.actions.js' '@EzPlatformAdminUiBundle/Resources/public/js/scripts/sidebar/btn/location.edit.js' + '@EzPlatformAdminUiBundle/Resources/public/js/scripts/sidebar/btn/user.edit.js' '@EzPlatformAdminUiBundle/Resources/public/js/scripts/sidebar/btn/location.create.js' '@EzPlatformAdminUiBundle/Resources/public/js/scripts/sidebar/instant.filter.js' '@EzPlatformAdminUiAssetsBundle/Resources/public/vendors/leaflet/dist/leaflet.js' diff --git a/src/bundle/Resources/views/content/modal_draft_conflict.html.twig b/src/bundle/Resources/views/content/modal_draft_conflict.html.twig index 8a20e381..74dd01ff 100644 --- a/src/bundle/Resources/views/content/modal_draft_conflict.html.twig +++ b/src/bundle/Resources/views/content/modal_draft_conflict.html.twig @@ -22,10 +22,15 @@ ) }}

- {{ 'draft.conflict.choice'|trans({})|desc('You can either edit any of your existing draft(s) or add a new one.') }} + {% if content_is_user %} + {{ 'draft.conflict.choice_content_is_user'|trans({})|desc('You can edit any of your existing draft(s)') }} + {% else %} + {{ 'draft.conflict.choice'|trans({})|desc('You can either edit any of your existing draft(s) or add a new one.') }} + {% endif %}

- {% include '@ezdesign/parts/table_header.html.twig' with { headerText: null, tools: version_modal_draft_conflict.table_header_tools() } %} + {% set show_add_draft_button = (not content_is_user) %} + {% include '@ezdesign/parts/table_header.html.twig' with { headerText: null, tools: version_modal_draft_conflict.table_header_tools(show_add_draft_button) } %}
{{ include('@ezdesign/content/tab/versions/table.html.twig', { 'versions': conflicted_drafts, @@ -33,6 +38,7 @@ 'is_draft': true, 'haveToPaginate': false, 'is_draft_conflict': true, + 'content_is_user': content_is_user }) }}
@@ -40,11 +46,13 @@ -{% macro table_header_tools() %} - +{% macro table_header_tools(show_add_button) %} + {% if show_add_button %} + + {% endif %} {% endmacro %} diff --git a/src/bundle/Resources/views/content/tab/versions/tab.html.twig b/src/bundle/Resources/views/content/tab/versions/tab.html.twig index e900d023..006e77bd 100644 --- a/src/bundle/Resources/views/content/tab/versions/tab.html.twig +++ b/src/bundle/Resources/views/content/tab/versions/tab.html.twig @@ -16,7 +16,8 @@ 'versions': draft_pager.currentPageResults, 'is_draft': true, 'form': form_version_remove_draft, - 'haveToPaginate': draft_pager.haveToPaginate + 'haveToPaginate': draft_pager.haveToPaginate, + 'content_is_user': content_is_user }) }} {{ form_end(form_version_remove_draft) }} @@ -63,7 +64,13 @@ }) }} {% include '@ezdesign/parts/table_header.html.twig' with { headerText: 'tab.versions.archived_versions'|trans()|desc('Archived versions'), tools: tab.table_header_tools(form_version_remove_archived) } %} {% if archived_versions is not empty %} - {{ include('@ezdesign/content/tab/versions/table.html.twig', { 'versions': archived_versions, 'form': form_version_remove_archived, 'is_archived': true, 'form_archived_version_restore': form_archived_version_restore }) }} + {{ include('@ezdesign/content/tab/versions/table.html.twig', { + 'versions': archived_versions, + 'form': form_version_remove_archived, + 'is_archived': true, + 'form_archived_version_restore': form_archived_version_restore, + 'content_is_user': content_is_user + }) }} {% else %}

{{ 'tab.versions.no_permission'|trans()|desc('You don\'t have access to view the content item\'s versions') }} diff --git a/src/bundle/Resources/views/content/tab/versions/table.html.twig b/src/bundle/Resources/views/content/tab/versions/table.html.twig index ed306fe3..0d267646 100644 --- a/src/bundle/Resources/views/content/tab/versions/table.html.twig +++ b/src/bundle/Resources/views/content/tab/versions/table.html.twig @@ -24,6 +24,20 @@ {% for version in versions %} + + {% set edit_url = content_is_user is defined and content_is_user ? + path('ez_user_update', { + 'contentId': version.contentInfo.id, + 'versionNo': version.versionNo, + 'language': version.translations[0].languageCode, + }) : path('ez_content_draft_edit', { + 'contentId': version.contentInfo.id, + 'versionNo': version.versionNo, + 'language': version.translations[0].languageCode, + 'locationId': location.id + }) + %} + {% if form is defined %} {{ form_widget(form.versions[version.versionNo], {'attr': {'disabled': not version.canDelete}}) }} @@ -52,7 +66,7 @@ {% if is_draft_conflict %} {% set edit_draft_disabled = version.author.id != admin_ui_config.user.user.id %} - @@ -62,20 +76,15 @@ {% elseif is_draft %} - +