Add workspace root content type #3749

raphael-s · 2017-12-07T16:23:22Z

Implements a new content type "WorkspaceRoot" which is the folderish parent for workspaces. (Workspace content type will be added later)

closes #3675

phgross · 2017-12-07T18:38:02Z

opengever/core/profiles/default/types/opengever.workspace.root.xml

+  <!-- enabled behaviors -->
+  <property name="behaviors">
+    <element value="opengever.tabbedview.interfaces.ITabbedViewEnabled" />
+    <element value="opengever.sharing.behaviors.IDossier" />


Is that really necessary, as soon as I know the workspace part should habe their own roles and permissions.

I used the xml of opengever.repository.repositoryroot as a base for this. I removed the behaviour now.

phgross · 2017-12-07T18:38:31Z

opengever/core/profiles/default/types/opengever.workspace.root.xml

+  <alias from="view" to="@@view" />
+
+  <!-- Actions -->
+


phgross · 2017-12-07T18:39:51Z

opengever/core/upgrades/20171206170115_add_workspace_root_content_type/upgrade.py

+
+    def __call__(self):
+        self.install_upgrade_profile()
+        self.update_workflow_security(


what ??? 😞

Clicked the button in lawgiver, I thought this would be necessary since I added a new permission. Seems like it is actually not needed, I removed the workflow update completely.

phgross · 2017-12-07T18:40:20Z

...170115_add_workspace_root_content_type/workflows/opengever_committee_workflow/definition.xml

@@ -0,0 +1,716 @@
+<?xml version='1.0' encoding='UTF-8'?>


??? 😞

--> 🗑

phgross · 2017-12-07T18:40:43Z

...d_workspace_root_content_type/workflows/opengever_committeecontainer_workflow/definition.xml

@@ -0,0 +1,401 @@
+<?xml version='1.0' encoding='UTF-8'?>


phgross · 2017-12-07T18:41:37Z

opengever/setup/profiles/default_content/content_creation/01_default_content.json

+        "_path": "teamraeume",
+        "_type": "opengever.workspace.root",
+        "title_de": "Teamräume",
+        "title_fr": "Teamräume",


ask niklaus for a meaningful translation.

phgross · 2017-12-07T18:41:55Z

opengever/setup/profiles/default_content/content_creation/01_default_content.json

+        "_type": "opengever.workspace.root",
+        "title_de": "Teamräume",
+        "title_fr": "Teamräume",
+        "_transitions": "publish"


is there a publish transition ...

Yes, there is. Have a look at the item above.

It works, just tested it. The item is published after its creation.

phgross · 2017-12-07T18:44:14Z

opengever/testing/fixtures.py

+    def create_workspaces(self):
+        self.workspace_root = self.register('workspace_root', create(
+            Builder('workspace_root').having(title_de=u'Teamr\xe4ume',
+                                             title_fr=u'Teamr\xe4ume')))


phgross · 2017-12-07T18:46:47Z

opengever/workspace/content/configure.zcml

@@ -0,0 +1,6 @@
+<configure


We do not have a content subdirectory in GEVER, i would move all that to opengever/workspace

jone · 2017-12-08T07:43:57Z

opengever/core/profiles/default/types/opengever.workspace.root.xml

+  <property name="description" i18n:translate="" />
+  <property name="icon_expr" />
+  <property name="allow_discussion">False</property>
+  <property name="global_allow">True</property>


-> False: you've already added it to the allowed-types on Plone Site.

jone · 2017-12-08T07:45:42Z

opengever/core/profiles/default/types/opengever.workspace.root.xml

+  <property name="default_view">tabbed_view</property>
+  <property name="default_view_fallback">False</property>
+  <property name="view_methods">
+    <element value="view" />


✂️ I think we only want a tabbedview here.
Having two values here probably lets the layout-menu pop up; we don't want that in GEVER.

jone · 2017-12-08T07:50:12Z

opengever/testing/fixtures.py

@@ -805,6 +806,11 @@ def create_committee(self, title, repository_folder, group_id,
                    group_id=group_id))
        return committee

+    def create_workspaces(self):


Please rename this to create_workspace_root.

Creating the workspaces should be separated and executed by another user in another freezed hour.

jone · 2017-12-08T07:51:11Z

opengever/workspace/browser/workspace_root.py

+
+
+@adapter(IFolderish, IDefaultBrowserLayer, IDexterityFTI)
+class AddView(DefaultAddView):


This view is not registered.
How do we test that?

jone · 2017-12-08T07:54:36Z

opengever/workspace/content/workspace_root.py

+        need any specific schema fields """
+
+
+alsoProvides(IWorkspaceRootSchema, IFormFieldProvider)


In GEVER we prefer to use the decorator style.
So please use

@provider(IFormFieldProvider) class IWorkspaceRootSchema(model.Schema): …

See https://github.com/4teamwork/opengever.core/blob/master/opengever/meeting/proposaltemplate.py#L14
I'm aware that there are places where this is not yet converted.

raphael-s · 2017-12-08T13:05:06Z

@jone @phgross I implemented your requested changes. Is it okay now?

jone

Bitte noch Übersetzungen den Titel des FTI auf Deutsch übersetzen.

Ansonsten siehts gut aus 👍

jone · 2017-12-11T12:37:05Z

Der Titel fehlt / ist kaputt.

jone · 2017-12-11T12:38:44Z

Bitte Standard-Workflow entfernen: der Typ soll momentan keinen Workflow haben, das kommt später.

phgross · 2017-12-11T12:40:44Z

opengever/workspace/workspace_root.py

+        need any specific schema fields """
+
+
+class WorkspaceRoot(Item):


Funktioniert die TranslatedTitle Funktionalität wirklich wie gewünscht? Aus meiner Sicht müsste hier das TranslatedTitleMixin verwendet werden. 🤔

raphael-s · 2017-12-12T09:35:05Z

@jone I removed the default workflow and added the TranslatedTitleMixin the way @phgross suggested it, the title is now displayed correctly. i18n translations for the FTI are now available aswell.

jone · 2017-12-12T11:54:39Z

opengever/core/locales/de/LC_MESSAGES/opengever.core.po

@@ -231,6 +231,10 @@ msgstr "Amtswechsler umschalten"
 msgid "Unlock unused repository prefixes."
 msgstr "Freigabe von ungebrauchten Aktenzeichen Prefixen."

+#: ./opengever/core/profiles/default/types/opengever.workspace.root.xml
+msgid "WorkspaceRoot"
+msgstr "Teamruäume"


jone · 2017-12-12T11:57:17Z

opengever/setup/profiles/default_content/content_creation/01_default_content.json

@@ -24,5 +24,12 @@
        "title_de": "Kontakte",
        "title_fr": "Contacts",
        "_transitions": "publish"
+    },
+    {
+        "_path": "teamraeume",


Ich finde die ID nicht schön. Wie wärs mit workspaces?

jone · 2017-12-12T11:57:53Z

opengever/testing/fixtures.py

+    def create_workspace_root(self):
+        self.workspace_root = self.register('workspace_root', create(
+            Builder('workspace_root').having(title_de=u'Teamr\xe4ume',
+                                             title_fr=u'Espace partag\xe9')))


Kann man hier die ID setzen? Wäre cool wenn wir die gleiche ID hätten wie im Example Content.

raphael-s · 2017-12-12T13:28:39Z

@jone Done 👍

jone

@raphael-s noch ein kleines Detail, ansonsten finde ichs gut.

jone · 2017-12-13T12:16:21Z

opengever/workspace/workspace_root.py

+class WorkspaceRoot(Item, TranslatedTitleMixin):
+    implements(IWorkspaceRoot)
+
+    Title = TranslatedTitleMixin.Title


@raphael-s mich hat schon vorher irritiert wie die Reihenfolge der vererbten Klasse ist; diese Zeile erklärts nun 😉

Ich schlage vor, dass du diese Zeile entfernst und dafür die Reihenfolge der Vererbten Superklassen umkehrst:

-class WorkspaceRoot(Item, TranslatedTitleMixin): +class WorkspaceRoot(TranslatedTitleMixin, Item):

Die MRO funktioniert so, dass die Klassen links die Klassen rechts überschreiben.

Ich würde dies machen auch wenn die anderen Orte im GEVER nicht so sind. Weil das Umkehren der MRO ist eigentlich korrekt und es hat keine Seiteneffekte.

I changed the order as you requested, now the tests fail. Also the title is no longer translated. Are you sure that the override order is left to right?

Okay, I think I got it now 😄

But the tests are still failing... what am I doing wrong?

@jone The inheritance order has to be the way it was before because Item does some magic which gets broken by changing the order. See -> #1394

jone

Ok then; please rebase 😉

raphael-s self-assigned this Dec 7, 2017

raphael-s requested a review from a team December 7, 2017 16:23

raphael-s force-pushed the rs-3675-WorkspaceRoot branch from e319405 to 5913bf3 Compare December 7, 2017 16:40

raphael-s changed the title ~~Implement workspace module (OGIP 17)~~ Add workspace root content type Dec 7, 2017

raphael-s added the Workspace (OGIP-17) label Dec 7, 2017

raphael-s force-pushed the rs-3675-WorkspaceRoot branch 3 times, most recently from d5fbff2 to d5aa211 Compare December 7, 2017 17:18

phgross requested changes Dec 7, 2017

View reviewed changes

jone suggested changes Dec 8, 2017

View reviewed changes

raphael-s force-pushed the rs-3675-WorkspaceRoot branch 5 times, most recently from b499001 to 99c4e91 Compare December 8, 2017 11:36

jone suggested changes Dec 11, 2017

View reviewed changes

phgross reviewed Dec 11, 2017

View reviewed changes

raphael-s force-pushed the rs-3675-WorkspaceRoot branch 4 times, most recently from ddc5cdb to e84fcec Compare December 12, 2017 09:28

raphael-s force-pushed the rs-3675-WorkspaceRoot branch from e84fcec to 2990f0c Compare December 12, 2017 09:36

jone suggested changes Dec 12, 2017

View reviewed changes

raphael-s force-pushed the rs-3675-WorkspaceRoot branch 2 times, most recently from 5797000 to c4fd8c9 Compare December 12, 2017 12:52

jone suggested changes Dec 13, 2017

View reviewed changes

raphael-s force-pushed the rs-3675-WorkspaceRoot branch 4 times, most recently from 6c5543d to e357fc7 Compare December 13, 2017 14:41

jone approved these changes Dec 13, 2017

View reviewed changes

OGIP 17: Add workspace root content type

f1be433

raphael-s force-pushed the rs-3675-WorkspaceRoot branch from e357fc7 to f1be433 Compare December 13, 2017 15:43

raphael-s merged commit 1d13b02 into master Dec 13, 2017

raphael-s deleted the rs-3675-WorkspaceRoot branch December 13, 2017 16:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add workspace root content type #3749

Add workspace root content type #3749

raphael-s commented Dec 7, 2017 •

edited

phgross Dec 7, 2017

raphael-s Dec 8, 2017

phgross Dec 7, 2017

phgross Dec 7, 2017

raphael-s Dec 8, 2017

phgross Dec 7, 2017

phgross Dec 7, 2017

phgross Dec 7, 2017

phgross Dec 7, 2017

raphael-s Dec 8, 2017

phgross Dec 7, 2017

phgross Dec 7, 2017

jone Dec 8, 2017

jone Dec 8, 2017

jone Dec 8, 2017

jone Dec 8, 2017

jone Dec 8, 2017

raphael-s commented Dec 8, 2017

jone left a comment

jone commented Dec 11, 2017 •

edited

jone commented Dec 11, 2017

phgross Dec 11, 2017

raphael-s commented Dec 12, 2017

jone Dec 12, 2017

jone Dec 12, 2017

jone Dec 12, 2017

raphael-s commented Dec 12, 2017

jone left a comment

jone Dec 13, 2017

raphael-s Dec 13, 2017

raphael-s Dec 13, 2017

raphael-s Dec 13, 2017

jone left a comment



		@adapter(IFolderish, IDefaultBrowserLayer, IDexterityFTI)
		class AddView(DefaultAddView):

		need any specific schema fields """


		alsoProvides(IWorkspaceRootSchema, IFormFieldProvider)

		need any specific schema fields """


		class WorkspaceRoot(Item):

Add workspace root content type #3749

Add workspace root content type #3749

Conversation

raphael-s commented Dec 7, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

raphael-s commented Dec 8, 2017

jone left a comment

Choose a reason for hiding this comment

jone commented Dec 11, 2017 • edited

jone commented Dec 11, 2017

Choose a reason for hiding this comment

raphael-s commented Dec 12, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

raphael-s commented Dec 12, 2017

jone left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jone left a comment

Choose a reason for hiding this comment

raphael-s commented Dec 7, 2017 •

edited

jone commented Dec 11, 2017 •

edited