[Amedes-cvs-commit] [ame] xml/misc/descriptions

sebd at users.labs.libre-entreprise.org sebd at users.labs.libre-entreprise.org
Fri Feb 11 17:31:39 CET 2005


Changement dans le répertoire ame/xml/misc/descriptions:
---
Fixed everything, more or less.
---  (par sebd)

Fichiers affectés:
-----------------
DynamicGroup.xml     modifié     (1.2 -> 1.3)
Permission.xml       modifié     (1.2 -> 1.3)
User.xml             modifié     (1.3 -> 1.4)
-------------- next part --------------
Index: ame/xml/misc/descriptions/DynamicGroup.xml
diff -u ame/xml/misc/descriptions/DynamicGroup.xml:1.2 ame/xml/misc/descriptions/DynamicGroup.xml:1.3
--- ame/xml/misc/descriptions/DynamicGroup.xml:1.2	Thu Jan 27 09:08:14 2005
+++ ame/xml/misc/descriptions/DynamicGroup.xml	Fri Feb 11 16:31:33 2005
@@ -65,8 +65,7 @@
     <xforms:input ref="@name">
      <xforms:label>Name</xforms:label>
     </xforms:input>
-    <xforms:select1 ref="@elementTypeName"><xforms:label>Element Type Name</xforms:label></xforms:select1>
-    <xforms:select1 ref="@elementTypeNamespace"><xforms:label>Element Type Namespace</xforms:label></xforms:select1>
+    <xforms:select1 pythonClass="ame.queries_descriptions.ElementTypeSelect1"><xforms:label>Element Type</xforms:label></xforms:select1>
    </xforms:group>
   </yep:body>
   <yep:actionButtonsBar>

Index: ame/xml/misc/descriptions/Permission.xml
diff -u ame/xml/misc/descriptions/Permission.xml:1.2 ame/xml/misc/descriptions/Permission.xml:1.3
--- ame/xml/misc/descriptions/Permission.xml:1.2	Thu Jan 27 09:08:14 2005
+++ ame/xml/misc/descriptions/Permission.xml	Fri Feb 11 16:31:33 2005
@@ -38,9 +38,8 @@
   <yep:body>
    <xforms:group model="permissionModel">
     <xforms:label>New Permission</xforms:label>
-     <xforms:input ref="@name"><xforms:label>Name</xforms:label></xforms:input>
-     <xforms:select1 ref="@elementTypeName"><xforms:label>Element Type Name</xforms:label></xforms:select1>
-     <xforms:select1 ref="@elementTypeNamespace"><xforms:label>Element Type Namespace</xforms:label></xforms:select1>
+    <xforms:input ref="@name"><xforms:label>Name</xforms:label></xforms:input>
+    <xforms:select1 pythonClass="ame.queries_descriptions.ElementTypeSelect1"><xforms:label>Element Type</xforms:label></xforms:select1>
    </xforms:group>
   </yep:body>
   <yep:actionButtonsBar>

Index: ame/xml/misc/descriptions/User.xml
diff -u ame/xml/misc/descriptions/User.xml:1.3 ame/xml/misc/descriptions/User.xml:1.4
--- ame/xml/misc/descriptions/User.xml:1.3	Thu Jan 27 09:08:14 2005
+++ ame/xml/misc/descriptions/User.xml	Fri Feb 11 16:31:33 2005
@@ -123,8 +123,8 @@
  <yep:page name="editPermissions" type="form" next="editPermissions">
   <yep:body>
    <xforms:group class="editPermissions">
-    <xforms:label>Edit field group access level sets</xforms:label>
-    <ame:permissionWidget/>
+    <xforms:label>Edit permissions</xforms:label>
+    <ame:permissionWidget typeName="Role" typeNamespace="http://www.lesdeveloppementsdurables.org/namespaces/ame/0.0"/>
    </xforms:group>
   </yep:body>
   <yep:actionButtonsBar>
@@ -133,11 +133,11 @@
     <yep:action>modify</yep:action>
    </yep:actionButton>
    <yep:actionButton nextStation="/permissions.dbxml/new-ame-permission">
-    <xforms:label>New field group access level set ...</xforms:label>
+    <xforms:label>New permission ...</xforms:label>
     <yep:action>newPermission</yep:action>
    </yep:actionButton>
    <yep:actionButton>
-    <xforms:label>Delete unchecked field group access level sets</xforms:label>
+    <xforms:label>Delete unchecked permissions</xforms:label>
     <yep:action>deleteUncheckedPermissions</yep:action>
    </yep:actionButton>
   </yep:actionButtonsBar>
@@ -240,41 +240,13 @@
    <xforms:group model="userModel">
     <xforms:label>User <xforms:output ref="yep:person/yep:fullName"/></xforms:label>
     <xforms:group pythonClass="ame.users_descriptions.UserTabs" type="submit"/>
-    <xforms:select nodeset="@roleIds" pythonClass="ame.roles_descriptions.RoleSelect">
+    <xforms:select nodeset="@roleIdList" pythonClass="ame.roles_descriptions.RoleSelect">
      <xforms:help>The set of roles should match the role(s) of the person within the organisation.</xforms:help>
     </xforms:select>
    </xforms:group>
   </yep:body>
   <yep:actionButtonsBar>
    <yep:actionButton pythonClass="ame.users_descriptions.ValidateRolesButton">
-    <xforms:label>Validate</xforms:label>
-    <yep:action>modify</yep:action>
-   </yep:actionButton>
-  </yep:actionButtonsBar>
- </yep:page>
-
- <yep:page name="superPowers" type="form" next="superPowers">
-  <yep:body>
-   <xforms:group model="userModel">
-    <xforms:label>User <xforms:output ref="yep:person/yep:fullName"/></xforms:label>
-    <xforms:help>Only administrators should have these administration rights checked.</xforms:help>
-    <xforms:group pythonClass="ame.users_descriptions.UserTabs" type="submit"/>
-    <xforms:input ref="@canManageRoles">
-     <xforms:label>Role Management</xforms:label>
-    </xforms:input>
-    <xforms:input ref="@canManageDynamicGroups">
-     <xforms:label>Dynamic Group Management</xforms:label>
-    </xforms:input>
-    <xforms:input ref="@canManageStaticGroups">
-     <xforms:label>Static Group Management</xforms:label>
-    </xforms:input>
-    <xforms:input ref="@canManageUsers">
-     <xforms:label>User Management</xforms:label>
-    </xforms:input>
-   </xforms:group>
-  </yep:body>
-  <yep:actionButtonsBar>
-   <yep:actionButton>
     <xforms:label>Validate</xforms:label>
     <yep:action>modify</yep:action>
    </yep:actionButton>


More information about the Amedes-cvs-commit mailing list