Mathijs den Burger pushed to branch bugfix/CHANNELMGR-727 at cms-community / hippo-addon-channel-manager
Commits: 5108ffa4 by Mathijs den Burger at 2016-06-08T09:35:30+02:00 CHANNELMGR-711 Open documents in edit mode instead of view mode - - - - - 735c5450 by Mathijs den Burger at 2016-06-08T13:19:28+02:00 CHANNELMGR-254 Remove duplicate DOCTYPE declaration - - - - - b747db58 by Mathijs den Burger at 2016-06-08T13:19:58+02:00 CHANNELMGR-727 Merge master changes in bugfix/CHANNELMGR-727 - - - - - 2 changed files: - frontend-ng/src/images/lock.svg - frontend/src/main/java/org/onehippo/cms7/channelmanager/channeleditor/OpenDocumentEditorEventListener.java Changes: ===================================== frontend-ng/src/images/lock.svg ===================================== --- a/frontend-ng/src/images/lock.svg +++ b/frontend-ng/src/images/lock.svg @@ -15,7 +15,6 @@ limitations under the License. --> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"> <g> ===================================== frontend/src/main/java/org/onehippo/cms7/channelmanager/channeleditor/OpenDocumentEditorEventListener.java ===================================== --- a/frontend/src/main/java/org/onehippo/cms7/channelmanager/channeleditor/OpenDocumentEditorEventListener.java +++ b/frontend/src/main/java/org/onehippo/cms7/channelmanager/channeleditor/OpenDocumentEditorEventListener.java @@ -25,6 +25,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.hippoecm.frontend.model.JcrNodeModel; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; +import org.hippoecm.frontend.service.EditorException; import org.hippoecm.frontend.service.IEditor; import org.hippoecm.frontend.service.IEditorManager; import org.hippoecm.frontend.service.ServiceException; @@ -74,13 +75,14 @@ class OpenDocumentEditorEventListener extends ExtEventListener { final JcrNodeModel documentHandleModel = new JcrNodeModel(documentHandle); IEditor<?> editor = editorManager.getEditor(documentHandleModel); if (editor == null) { - editor = editorManager.openPreview(documentHandleModel); + editor = editorManager.openEditor(documentHandleModel); } + editor.setMode(IEditor.Mode.EDIT); editor.focus(); } catch (ItemNotFoundException e) { ChannelEditor.log.warn("Could not find document with uuid '{}'", documentHandleUuid, e); - } catch (RepositoryException|ServiceException e) { - ChannelEditor.log.warn("Failed to open document editor for document with uuid '{}'", documentHandleUuid, e); + } catch (EditorException|RepositoryException|ServiceException e) { + ChannelEditor.log.warn("Failed to open editor for document with uuid '{}'", documentHandleUuid, e); } } } View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/4934bc4d8aa2fba2211e6f9553d795a5721b40ae...b747db583571b90d9e5bd51aa0807f35bb630df0
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
