Arent-Jan Banck pushed to branch master at cms-community / hippo-addon-channel-manager
Commits: c172d108 by Michiel Eggermont at 2017-09-27T09:42:57+02:00 CHANNELMGR-1439 Set projectdocs development version - - - - - 1439bb22 by Michiel Eggermont at 2017-09-27T15:27:40+02:00 CHANNELMGR-1439 Use the new API for getting/setting active project - - - - - dce46f23 by Michiel Eggermont at 2017-09-27T15:33:18+02:00 CHANNELMGR-1439 Rename method - - - - - 420cd0ae by Arent-Jan Banck at 2017-09-29T23:18:09+02:00 CHANNELMGR-1439 Merge masater changes in feature/projectdocs - - - - - 08ba3f42 by Michiel Eggermont at 2017-10-02T11:54:35+02:00 CHANNELMGR-1439 Use feature versions of hst and cms - - - - - 301a9e24 by Michiel Rop at 2017-10-06T16:13:55+02:00 CHANNELMGR-1439: Update pom to new hippo-cms7-project version - - - - - 1f5907cb by Michiel Eggermont at 2017-10-13T16:41:09+02:00 CHANNELMGR-1439 Merge master into feature/projectdocs - - - - - 2826cb65 by Michiel Eggermont at 2017-10-13T16:43:21+02:00 CHANNELMGR-1505 Make all EditingUtils methods non-static - - - - - 88854852 by Michiel Eggermont at 2017-10-13T16:43:21+02:00 CHANNELMGR-1505 Remove singleton pattern from document service This will make it possible to make the document service configurable. - - - - - e3496378 by Michiel Eggermont at 2017-10-13T16:43:21+02:00 CHANNELMGR-1505 Extract UserUtils Because this method has not directly to do with editing. - - - - - 2951aa53 by Michiel Eggermont at 2017-10-13T16:43:21+02:00 CHANNELMGR-1505 Make EditingUtils pluggable - - - - - 49191a5b by Michiel Eggermont at 2017-10-13T16:43:21+02:00 CHANNELMGR-1505 Inject DocumentService and EditingUtils - - - - - a87b944e by Michiel Eggermont at 2017-10-13T16:43:21+02:00 CHANNELMGR-1505 Extract EditingUtils interface - - - - - 5e114325 by Michiel Eggermont at 2017-10-13T16:43:21+02:00 CHANNELMGR-1505 Amend copyright headers - - - - - 0b06eaf2 by Michiel Eggermont at 2017-10-16T15:07:48+02:00 CHANNELMGR-1505 Extract HintsInspector interface EditingUtils was the wrong abstraction. We actually only need to extract methods that have to do with the hints. So, extract a HintsInspector interface and inject it into the EditingUtils. - - - - - 27d454d5 by Michiel Eggermont at 2017-10-16T15:33:42+02:00 CHANNELMGR-1505 Fix copyright headers - - - - - 792f2b4b by Ard Schrijvers at 2017-10-18T14:13:42+02:00 CHANNELMGR-1528 bump repository version - - - - - 5add0f2d by Ard Schrijvers at 2017-10-18T17:09:27+02:00 CHANNELMGR-1529 Make sure the channel mngr does all workflow invocations taking payload context into account - - - - - fc2f9d89 by Michiel Rop at 2017-10-23T15:39:24+02:00 CHANNELMGR-1534 Make workflow call user context aware - - - - - 5bcdc92a by Michiel Rop at 2017-10-23T21:27:20+02:00 CHANNELMGR-1534 Make workflow call user context aware - - - - - 73c888e0 by Michiel Eggermont at 2017-10-26T09:29:05+02:00 CHANNELMGR-1469 Add OTHER_PROJECT error reason and label - - - - - 6e68a600 by Michiel Eggermont at 2017-10-26T11:28:10+02:00 CHANNELMGR-1549 Add CORE_PROJECT error reason and label - - - - - 3e1379a0 by Ard Schrijvers at 2017-10-30T14:05:09+01:00 CHANNELMGR-1556 Account for rename from SessionDataProvider to SessionRequestContextProvider - - - - - d652182b by Ard Schrijvers at 2017-11-02T16:46:44+01:00 CHANNELMGR-1534 revert the contextPayload awareness - - - - - cab10a76 by Ard Schrijvers at 2017-11-03T11:57:42+01:00 CHANNELMGR-1559 Drop 'contextPayload' logic in channel mngr content resource endpoint - - - - - 06452ec0 by Michiel Rop at 2017-11-06T21:08:45+01:00 CHANNELMGR-1559 Account for the 'drop' of contextPayload and 'active project' logic - copyToPreviewAndKeepEditing does not throw exception (anymore) - check if Object wrapped by optional is present - fix imports - - - - - 237acc8d by Michiel Rop at 2017-11-09T16:41:32+01:00 CHANNELMGR-1572 Fix unit test - - - - - e20003c0 by Michiel Eggermont at 2017-11-28T12:05:48+01:00 CHANNELMGR-1618 Put contextPayload in hints The ChannelContentResource exposes an API for CRUD operations on documents. The Resource delegates to a ContentService. The implementation of the service uses the HintsInspector to decide if a CRUD operation is allowed or not. The hints passed to the inspector currently only contain the workflow hints. This is sometimes not sufficient. The the context payload from the CmsSessionContext can contain additional parameters that could be inspected by the hints inspector to decide if a CRUD operation is allowed or not. So, before passing the hints to the HintsInspector the ContentService must merge all the 'hints' from the context payload with the workflow hints. - Change the ContentService method args so that the contextPayload can be passed from the REST resource to the ContentService. - EditingUtils should only contain static utility methods related to document CRUD operations. So move all the hints inspection code to the ContentServiceImpl. - - - - - e0558a55 by Arent-Jan Banck at 2017-11-28T16:46:28+01:00 CHANNELMGR-1528 Merge master into feature/projectdoc - - - - - d402e659 by Arent-Jan Banck at 2017-12-05T15:24:56+01:00 CHANNELMGR-1528 Merge master into feature/projectdoc - - - - - 5d6599fc by Ard Schrijvers at 2017-12-11T14:01:23+01:00 CHANNELMGR-1642 Support error info for project in invalid state or project not found - - - - - 66744fbb by Michiel Eggermont at 2017-12-13T13:11:48+01:00 CHANNELMGR-1642 Rename OTHER_PROJECT to PART_OF_PROJECT There are situations where a document cannot be edited while the active and associated project for a document are the same. In that case we want to show the same message as when the document belongs to another project than the active one. This is also more in line with what is shown in the content perspective. - - - - - c6d72135 by Arent-Jan Banck at 2018-01-09T12:46:18+01:00 CHANNELMGR-1528 Merge master into feature/projectdocs - - - - - 468b5b25 by Arent-Jan Banck at 2018-01-15T10:29:46+01:00 CHANNELMGR-1528 Merge master into feature/projectdocs - - - - - 18262e0d by Michiel Rop at 2018-01-23T12:09:11+01:00 CHANNELMGR-1689 Remove UserUtils Move UserUtils to repository, because the functionality is needed in other module as well. See REPO-1929. - - - - - 1079cb5e by Joeri de Gooijer at 2018-01-23T17:11:02+01:00 CHANNELMGR-1528 Merge branch 'master' into feature/projectdocs - - - - - 648719f6 by Michiel Eggermont at 2018-01-24T10:01:40+01:00 CHANNELMGR-1689 Fix compilation error Compilation error was caused by the move of UserUtils from here to repository-utilities. Fixed by adding the repository-utilities dependency and importing the class in the HintsInspectorImpl. - - - - - bcf69179 by Arent-Jan Banck at 2018-01-25T10:43:54+01:00 CHANNELMGR-1528 Merge branch 'master' into feature/projectdocs - - - - - 65b33515 by Arent-Jan Banck at 2018-01-25T12:30:10+01:00 CHANNELMGR-1528 Merge branch 'master' into feature/projectdocs - - - - - 05b6fb84 by Michiel Eggermont at 2018-02-05T10:58:42+01:00 CHANNELMGR-1528 Merge branch 'master' into feature/projectdocs - - - - - d4e5899f by Arent-Jan Banck at 2018-02-05T14:19:42+01:00 CHANNELMGR-1528 Merge branch 'master' into feature/projectdocs - - - - - 38cc69fd by Michiel Eggermont at 2018-02-07T12:02:51+01:00 CHANNELMGR-1702 Use channelId of parent if channel has a branchId Currently the channel store only contains master channels. So the Ext javascript code in the client only knows about master channels too. If a channel branch must be opened in the channel editor we can't use the channelId of the branch, but instead use the channelId of it's parent, i.e. use channelDocument#branchOf(). Then we must also tell the javascript code the id of the branch so that the hst can be requested to set the active branch (via a rest call) for rendering the preview of the site. Preferably we would of course want to populate the channel store with all channels (master and branches), which would make it possible to just use the channelId directly without the branchId. We can't do that however because then the channel overview would also show all the branches as channels. The user would not be able to tell which channel is master and which are branches because the look the same. To implement this properly we first need a good design. - - - - - 9afa32e8 by Michiel Eggermont at 2018-02-08T11:19:18+01:00 CHANNELMGR-1717 Update translation with screen design - - - - - fc72c0c3 by Arent-Jan Banck at 2018-02-08T16:13:32+01:00 CHANNELMGR-1528 Merge branch 'master' into feature/projectdocs - - - - - a720ddc5 by Arent-Jan Banck at 2018-02-13T16:27:33+01:00 CHANNELMGR-1528 Merge branch 'master' into feature/projectdocs - - - - - 1eeddddb by Joeri de Gooijer at 2018-02-14T12:00:26+01:00 CHANNELMGR-1724 Add 'Associate document to project' in VE - - - - - cc7d3280 by Joeri de Gooijer at 2018-02-14T12:01:40+01:00 CHANNELMGR-1714 Reintegrate branch 'feature/projectdocs-CHANNELMGR-1714' into feature/projectdocs - - - - - 407be97c by Arent-Jan Banck at 2018-02-15T20:21:00+01:00 CHANNELMGR-1714 Reintegrate feature/projectdocs - - - - - 30 changed files: - content-service/pom.xml - content-service/src/main/java/org/onehippo/cms/channelmanager/content/ChannelContentServiceModule.java - content-service/src/main/java/org/onehippo/cms/channelmanager/content/ContentResource.java - content-service/src/main/java/org/onehippo/cms/channelmanager/content/document/DocumentsService.java - content-service/src/main/java/org/onehippo/cms/channelmanager/content/document/DocumentsServiceImpl.java - + content-service/src/main/java/org/onehippo/cms/channelmanager/content/document/util/HintsInspector.java - + content-service/src/main/java/org/onehippo/cms/channelmanager/content/document/util/HintsInspectorImpl.java - content-service/src/main/java/org/onehippo/cms/channelmanager/content/error/ErrorInfo.java - content-service/src/test/java/org/onehippo/cms/channelmanager/content/ContentResourceTest.java - content-service/src/test/java/org/onehippo/cms/channelmanager/content/document/DocumentsServiceImplTest.java - content-service/src/test/java/org/onehippo/cms/channelmanager/content/document/util/EditingUtilsTest.java - + content-service/src/test/java/org/onehippo/cms/channelmanager/content/document/util/HintsInspectorImplTest.java - frontend-api/pom.xml - frontend-ng/src/app/channel/channel.service.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/contentEditor.controller.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/contentEditor.service.js - + frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/addToProject/addToProject.component.js - + frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/addToProject/addToProject.controller.js - + frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/addToProject/addToProject.html - + frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/addToProject/addToProject.scss - + frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/addToProject/addToProject.spec.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/editContent.module.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/editContent.service.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/editContentMain.controller.js - frontend-ng/src/app/channel/sidePanels/rightSidePanel/editContent/editContentMain.html - frontend-ng/src/app/services/project.service.js - frontend-ng/src/app/services/project.service.spec.js - frontend-ng/src/i18n/en.json - frontend-ng/src/styles/_side-panel.scss - frontend/src/main/java/org/onehippo/cms7/channelmanager/plugins/channelactions/ChannelActionsPlugin.java The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/66008ff6e2e0fe722949445cdfbaf2c2510d4895...407be97cf235abfd90106de225235f53302b8c7f --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/66008ff6e2e0fe722949445cdfbaf2c2510d4895...407be97cf235abfd90106de225235f53302b8c7f You're receiving this email because of your account on code.onehippo.org.
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
