Changeset 953

Timestamp:

27 Nov 2006, 22:03:04 (18 years ago)

Author:

Henrik Bettermann

Message:

member directory acl permission, schema and layouts changed
not yet optimized

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/actions.xml (modified) (2 diffs)
• profiles/default/layouts/members.xml (modified) (7 diffs)
• profiles/default/schemas/members.xml (modified) (3 diffs)
• skins/waeup_directory/getWAeUPDirectoryActions.py (added)
• skins/waeup_directory/layout_waeup_dir_edit.pt (modified) (1 diff)
• skins/waeup_directory/member_create_form.pt (added)
• skins/waeup_directory/member_created.py (added)
• skins/waeup_directory/member_delete.py (added)
• skins/waeup_directory/member_edit_form.pt (added)
• skins/waeup_directory/member_view.pt (modified) (1 diff)
• skins/waeup_directory/members_edit_form.pt (deleted)
• skins/waeup_directory/search_members.py (modified) (1 diff)
• skins/waeup_directory/search_members_form.pt (modified) (2 diffs)
• skins/waeup_directory/search_members_results.pt (modified) (1 diff)

WAeUP_SRP/trunk/profiles/default/actions.xml

@@ -32 +32 @@
      category="user"
      condition_expr="python:member and member.has_role("Member")"
-     url_expr="string:${portal_url}/cpsdirectory_entry_view?dirname=members&id=${member}"
+     url_expr="string:${portal_url}/member_view?dirname=members&id=${member}"
      visible="True">
    <permission>View</permission>
@@ -93 +93 @@
   </action>
   <action title="Directories" action_id="directories" category="global"
-     condition_expr="python:not portal.portal_membership.isAnonymousUser()"
-     url_expr="string:${portal_url}/cpsdirectory_view" visible="False">
+     condition_expr="here/isSectionManager"
+     url_expr="string:${portal_url}/cpsdirectory_view" visible="True">
    <permission>Modify portal content</permission>
   </action>

WAeUP_SRP/trunk/profiles/default/layouts/members.xml

@@ -32 +32 @@
   </property>
   <property name="is_required">True</property>
-  <property name="label">label_email</property>
-  <property name="label_edit">label_email</property>
-  <property name="description">Member email</property>
+  <property name="label">Email</property>
+  <property name="label_edit">Email</property>
+  <property name="description"></property>
   <property name="is_i18n">True</property>
   <property name="size_max">0</property>
@@ -42 +42 @@
    <element value="fullname"/>
   </property>
-  <property name="label">label_full_name</property>
-  <property name="label_edit">label_full_name</property>
-  <property name="description">Member full name</property>
+  <property name="label">Full Name</property>
+  <property name="label_edit">Full Name</property>
+  <property name="description"></property>
   <property name="is_i18n">True</property>
   <property name="hidden_layout_modes">
@@ -56 +56 @@
    <element value="givenName"/>
   </property>
-  <property name="label">label_first_name</property>
-  <property name="label_edit">label_first_name</property>
-  <property name="description">Member first name</property>
+  <property name="label">First Name</property>
+  <property name="label_edit">First Name</property>
+  <property name="description"></property>
   <property name="is_i18n">True</property>
  </widget>
@@ -65 +65 @@
    <element value="groups"/>
   </property>
-  <property name="label">label_groups</property>
-  <property name="label_edit">label_groups</property>
-  <property name="description">Member groups</property>
+  <property name="label">Groups</property>
+  <property name="label_edit">Groups</property>
+  <property name="description"></property>
   <property name="is_i18n">True</property>
   <property name="vocabulary">groups</property>
@@ -89 +89 @@
   </property>
   <property name="is_required">True</property>
-  <property name="label">label_user_name</property>
-  <property name="label_edit">label_user_name</property>
-  <property name="description">Member login</property>
+  <property name="label">User Name</property>
+  <property name="label_edit">User Name</property>
+  <property name="description"></property>
   <property name="is_i18n">True</property>
   <property name="readonly_layout_modes">
@@ -116 +116 @@
   <property name="size_max">0</property>
  </widget>
- <widget name="roles" meta_type="Generic MultiSelect Widget">
-  <property name="fields">
-   <element value="roles"/>
-  </property>
-  <property name="label">label_roles</property>
-  <property name="label_edit">label_roles</property>
-  <property name="description">Member roles</property>
-  <property name="is_i18n">True</property>
-  <property name="vocabulary">global_roles</property>
-  <property name="translated">True</property>
-  <property name="render_format">checkbox</property>
- </widget>
+<widget name="roles" meta_type="Generic MultiSelect Widget">
+ <property name="fields">
+  <element value="roles"/>
+ </property>
+ <property name="label">Roles</property>
+ <property name="label_edit">Roles</property>
+ <property name="description"></property>
+ <property name="is_i18n">True</property>
+ <property name="readonly_layout_modes"/>
+ <property name="hidden_layout_modes"/>
+ <property name="hidden_readonly_layout_modes"/>
+ <property name="hidden_if_expr">not: context/isSectionManager</property>
+ <property name="vocabulary">global_roles</property>
+ <property name="translated">True</property>
+ <property name="render_format">checkbox</property>
+</widget>
  <widget name="sn" meta_type="String Widget">
   <property name="fields">
@@ -133 +137 @@
   </property>
   <property name="is_required">True</property>
-  <property name="label">label_last_name</property>
-  <property name="label_edit">label_last_name</property>
-  <property name="description">Member last name</property>
+  <property name="label">Last Name</property>
+  <property name="label_edit">Last Name</property>
+  <property name="description"></property>
   <property name="is_i18n">True</property>
  </widget>

WAeUP_SRP/trunk/profiles/default/schemas/members.xml

@@ -6 +6 @@
  </field>
  <field name="email" meta_type="CPS String Field">
-  <property name="acl_write_roles">Manager; Owner</property>
+  <property name="acl_write_roles">Manager; Owner; SectionOfficer</property>
  </field>
  <field name="fullname" meta_type="CPS String Field">
@@ -21 +21 @@
  </field>
  <field name="givenName" meta_type="CPS String Field">
-  <property name="acl_write_roles">Manager; Owner</property>
+  <property name="acl_write_roles">Manager; Owner; SectionOfficer</property>
  </field>
  <field name="groups" meta_type="CPS String List Field">
-  <property name="acl_write_roles">Manager</property>
+  <property name="acl_write_roles">Manager; SectionOfficer</property>
  </field>
  <field name="homeless" meta_type="CPS Int Field">
   <property name="default_expr">python: 1</property>
-  <property name="acl_write_roles">Manager</property>
+  <property name="acl_write_roles">Manager; SectionOfficer</property>
  </field>
  <field name="id" meta_type="CPS String Field"/>
  <field name="password" meta_type="CPS Password Field">
-  <property name="acl_write_roles">Manager; Owner</property>
+  <property name="acl_write_roles">Manager; Owner; SectionOfficer</property>
  </field>
  <field name="roles" meta_type="CPS String List Field">
@@ -39 +39 @@
  </field>
  <field name="sn" meta_type="CPS String Field">
-  <property name="acl_write_roles">Manager; Owner</property>
+  <property name="acl_write_roles">Manager; Owner; SectionOfficer</property>
  </field>
 </object>

WAeUP_SRP/trunk/skins/waeup_directory/layout_waeup_dir_edit.pt

@@ -67 +67 @@
     <tal:block condition="has_edits">
     <input type="submit" class="standalone"
-      name="cpsdirectory_entry_edit_form:method"
+      name="member_edit_form:method"
       value="button_change" i18n:attributes="value"
       tal:condition="not:creation" />
     <input type="submit" class="standalone"
-      name="cpsdirectory_entry_create_form:method"
+      name="member_create_form:method"
       value="button_create" i18n:attributes="value"
       tal:condition="creation" />

WAeUP_SRP/trunk/skins/waeup_directory/member_view.pt

@@ -6 +6 @@
   "/>
 <metal:block use-macro="here/main_template/macros/master">
+
   <metal:block fill-slot="style_slot">
-    <tal:block define="dummy
-      python:context.setDirectoryBreadCrumbs(request, dirname, dir, dirtitle)"/>
     <tal:block define="global actions
-      python:context.getDirectoryActions(actions, dirname, dir, 'view', id)"/>
-
+      python:context.getWAeUPDirectoryActions(actions, dirname, dir, 'view', id)"/>
     <link rel="Stylesheet" type="text/css" href=""
       tal:attributes="href string:${base_url}document.css" />
   </metal:block>
 
-  <metal:block fill-slot="header">
-    <h1>
-      <span i18n:translate="" tal:content="dirtitle" />:
-      <span i18n:translate="cpsdir_label_view_entry">view entry</span>
-    </h1>
-    <div class="description">
-    </div>
-  </metal:block>
+
 
   <metal:block fill-slot="main" tal:define="
-    title_field dir/title_field;
+    
     res python: dir.renderEntryDetailed(id);
     global rendered_main python: res[0];
     ds python: res[1];
     global title ds/?title_field|id;">
+    
+    <h3>
+      <span tal:content="ds/fullname" />     
+    </h3>
+
 
     <div tal:replace="structure rendered_main">Rendered main...</div>

WAeUP_SRP/trunk/skins/waeup_directory/search_members.py

@@ -56 +56 @@
     results = dir.searchEntries(return_fields=return_fields, **mapping)
 except SearchSizeLimitExceeded, e:
-    rendered = dir.cpsdirectory_entry_search_errors(exception=e)
+    rendered = dir.member_search_errors(exception=e)
     return rendered, 'results'
 

WAeUP_SRP/trunk/skins/waeup_directory/search_members_form.pt

@@ -9 +9 @@
       python:context.setDirectoryBreadCrumbs(request, dirname, dir, dirtitle)"/>
     <tal:block define="global actions
-      python:context.getDirectoryActions(actions, dirname, dir, 'search')"/>
+      python:context.getWAeUPDirectoryActions(actions, dirname, dir, 'search')"/>
 
     <link rel="Stylesheet" type="text/css" href=""
@@ -27 +27 @@
     global portal_status_message python: (validate and not ok and
       'psm_content_error') or request.form.get('portal_status_message', '');">
-    <h1>
-      <span i18n:translate="" tal:content="dirtitle" />:
-      <span tal:condition="python: ok == 'results'"
-        i18n:translate="">cpsdir_label_results
-      </span>
-      <span tal:condition="python: ok != 'results'"
-         i18n:translate="cpsdir_label_search_entry">search an entry
-      </span>
-    </h1>
-
+    <h3>
+      Search Member Section
+    </h3>
+    <br />
     <div tal:replace="structure rendered_main">Rendered main...</div>
   </metal:block>

WAeUP_SRP/trunk/skins/waeup_directory/search_members_results.pt

@@ -16 +16 @@
   ">
   <div style="padding-left: 1.5em">
-    <form action="cpsdirectory_entry_delete" method="post">
+    <form action="member_delete" method="post">
       <table tal:condition="results" summary="search result list">
         <tr>