Merge branch 'master' into team-managed

Conflicts: src/ploneintranet/workspace/browser/roster.py
ploneintranet · Jun 26, 2014 · 62fba19 · 62fba19
2 parents 7971e00 + 4295d41
commit 62fba19
Show file tree

Hide file tree

Showing 6 changed files with 162 additions and 139 deletions.
diff --git a/src/ploneintranet/workspace/browser/configure.zcml b/src/ploneintranet/workspace/browser/configure.zcml
@@ -9,6 +9,7 @@
     i18n_domain="ploneintranet.workspace">
 
   <include package="plone.app.portlets" />
+  <include package="collective.workspace" />
 
   <browser:page
       name="policies"
@@ -47,6 +48,14 @@
      permission="zope2.View"
      />
 
+   <browser:page
+     name="update_roster"
+     for="ploneintranet.workspace.workspacefolder.IWorkspaceFolder"
+     class=".roster.EditRoster"
+     attribute="update_roster"
+     permission="collective.workspace.ManageRoster"
+     />
+
    <browser:viewlet
      name="ploneintranet.workspace.join"
      manager="plone.app.layout.viewlets.interfaces.IAboveContentTitle"

diff --git a/src/ploneintranet/workspace/browser/roster-edit.pt b/src/ploneintranet/workspace/browser/roster-edit.pt
diff --git a/src/ploneintranet/workspace/browser/roster.py b/src/ploneintranet/workspace/browser/roster.py
@@ -17,25 +17,26 @@ class EditRoster(BrowserView):
     Based on the @@sharing tab from plone.app.workflow
     """
 
-    index = ViewPageTemplateFile('roster-edit.pt')
+    index = ViewPageTemplateFile('templates/roster-edit.pt')
 
     def __call__(self):
-        """Perform the update and redirect if necessary, or render the page
-        """
-        self.handle_form()
         return self.index()
 
-    def handle_form(self):
+    def update_roster(self, REQUEST=None):
+        """
+        If workspace is team managed, users can add/remove participants.
+        Any user with the manage workspace permission can add/remove
+        participants and admins.
+        """
+        CheckAuthenticator(self.request)
+        PostOnly(self.request)
         form = self.request.form
-        submitted = form.get('form.submitted', False)
-        save_button = form.get('form.button.Save', None) is not None
-        if submitted and save_button:
-            CheckAuthenticator(self.request)
-            PostOnly(self.request)
-            entries = form.get('entries', [])
-            self.update_users(entries)
-            api.portal.show_message(message=_(u'Roster updated.'),
-                                    request=self.request)
+        entries = form.get('entries', [])
+        self.update_users(entries)
+        api.portal.show_message(message=_(u'Roster updated.'),
+                                request=self.request)
+        return self.request.response.redirect(
+            '%s/@@edit-roster' % self.context.absolute_url())
 
     @clearafter
     def update_users(self, entries):
@@ -111,3 +112,12 @@ def existing_users(self):
             )
 
         return info
+
+    def can_manage_workspace(self):
+        """
+        does this user have permission to manage the workspace
+        """
+        return checkPermission(
+            "ploneintranet.workspace: Manage workspace",
+            self.context,
+        )
diff --git a/src/ploneintranet/workspace/browser/templates/roster-edit.pt b/src/ploneintranet/workspace/browser/templates/roster-edit.pt
@@ -0,0 +1,124 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+      lang="en"
+      metal:use-macro="context/main_template/macros/master"
+      i18n:domain="plone">
+
+  <head>
+  </head>
+
+  <body>
+    <metal:main fill-slot="main"
+		tal:define="context_state context/@@plone_context_state;
+			    user_cannot_manage python:
+			    not view.can_manage_workspace();
+			    ">
+
+      <h1 class="documentFirstHeading"
+          i18n:translate="heading_edit_roster">
+        Edit roster for
+        <q tal:content="context/Title" i18n:name="folder">title</q>
+      </h1>
+
+      <div tal:replace="structure provider:plone.abovecontentbody"
+	   tal:condition="not:ajax_load" />
+
+      <div id="content-core">
+        <form method="post"
+              tal:attributes="action string:${context/absolute_url}/@@edit-roster">
+
+          <input type="hidden" name="form.submitted:boolean" value="True" />
+
+          <div class="field">
+            <input type="text"
+                   id="edit-roster-user-search"
+                   size="30"
+                   name="search_term"
+                   title="Search for a user"
+                   placeholder="Search for a user"
+                   i18n:attributes="title; placeholder"
+                   tal:attributes="value request/search_term|nothing"
+                   class="searchField"
+                   value=""
+                   />
+            <input type="submit"
+                   id="edit-roster-search-button"
+                   name="form.button.SearchUsers"
+                   value="Search users"
+                   class="searchButton allowMultiSubmit"
+                   i18n:attributes="value label_search"
+                   />
+          </div>
+	</form>
+
+	<form method="post"
+              tal:attributes="action string:${context/absolute_url}/@@update_roster">
+          <div id="edit-roster-container">
+            <table metal:define-macro="edit-roster" id="edit-roster"
+		   class="listing"
+		   summary="Current users"
+		   tal:define="users view/users;"
+		   i18n:attributes="summary rostered-users;">
+
+              <thead metal:define-macro="edit-roster-head" id="edit-roster-head">
+                <tr>
+                  <th i18n:translate="label_name">Name</th>
+                  <th class="nosort">Participant</th>
+                  <th class="nosort">Workspace Admin</th>
+                </tr>
+              </thead>
+
+              <tbody metal:define-macro="edit-roster-settings" id="edit-roster-settings">
+                <tal:entries repeat="user users">
+                  <tr tal:define="oddrow repeat/user/odd;
+                                  is_admin user/admin | nothing;
+                                  is_member user/member | nothing"
+                      tal:attributes="class python:oddrow and 'odd' or 'even'">
+                    <td>
+                      <span tal:replace="user/title" />
+                      <input
+                         type="hidden"
+                         name="entries.id:records"
+                         tal:attributes="value user/id"
+                         />
+                      <input
+                         type="hidden"
+                         name="entries.type:records"
+                         value="user"
+                         />
+                    </td>
+                    <td class="listingCheckbox">
+                      <input class="noborder"
+                             type="checkbox"
+                             value="1"
+                             name="entries.member:records"
+                             tal:attributes="checked is_member;
+                                             disabled is_admin"
+                             />
+                      <input type="hidden"
+                             name="entries.member:records"
+                             value="1"
+                             tal:condition="is_admin" />
+                    </td>
+                    <td class="listingCheckbox">
+                      <input class="noborder"
+                             type="checkbox"
+                             value="1"
+                             name="entries.admin:records"
+                             tal:attributes="checked is_admin;
+					     disabled user_cannot_manage;"
+                             />
+                    </td>
+                  </tr>
+                </tal:entries>
+              </tbody>
+            </table>
+          </div>
+
+          <input id="edit-roster-save-button" class="context allowMultiSubmit" type="submit" name="form.button.Save" value="Save" i18n:attributes="value label_save" />
+          <input tal:replace="structure context/@@authenticator/authenticator" />
+
+        </form>
+      </div>
+    </metal:main>
+  </body>
+</html>
diff --git a/src/ploneintranet/workspace/overrides.zcml b/src/ploneintranet/workspace/overrides.zcml
@@ -10,7 +10,7 @@
       name="edit-roster"
       for="collective.workspace.interfaces.IHasWorkspace"
       class=".browser.roster.EditRoster"
-      permission="cmf.ModifyPortalContent"
+      permission="collective.workspace.ViewRoster"
       />
 
 </configure>
diff --git a/src/ploneintranet/workspace/tests/test_roster.py b/src/ploneintranet/workspace/tests/test_roster.py
@@ -2,6 +2,7 @@
 from plone import api
 from ploneintranet.workspace.tests.base import BaseTestCase
 from ploneintranet.workspace.tests.base import FunctionalBaseTestCase
+from ploneintranet.workspace.browser.roster import EditRoster
 from zope.component import getMultiAdapter
 from zExceptions import Forbidden
 from collective.workspace.interfaces import IWorkspace
@@ -74,18 +75,13 @@ def test_index(self):
             html
         )
 
-    def test_handle_form(self):
-        self.request.form['form.submitted'] = True
-        self.request.form['form.button.Save'] = True
-        view = getMultiAdapter(
-            (self.workspace, self.request),
-            name='edit-roster'
-        )
+    def test_update_roster(self):
+        er = EditRoster(self.workspace, self.request)
         # This will give forbidden - see browser test
         # for further tests of this
         self.assertRaises(
             Forbidden,
-            view.handle_form,
+            er.update_roster,
         )
 
     def test_existing_users(self):