[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Services/RoleService/Views/Browser - Adder.py:1.1.4.2 browser.zcml:1.1.4.3

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Services/RoleService/Views/Browser
In directory cvs.zope.org:/tmp/cvs-serv12187/lib/python/Zope/App/OFS/Services/RoleService/Views/Browser

Modified Files:
      Tag: Zope-3x-branch
	Adder.py browser.zcml 
Log Message:
Merging in Zope3InWonderland-branch, which implemented the following
proposals (see
http://dev.zope.org/Wikis/DevSite/Projects/ComponentArchitecture/OldProposals): 
- RenameAllowToRequire

- GroupClassRelatedDirectivesInClassDirective

- ViewInterfaceAndSimplification

- ConsistentUseOfSpacesAsDelimitersInZCMLAttributes

- TwoArgumentViewConstructors

- ImplementsInZCML

- SimpleViewCreationInZCML

- RemoveGetView

- ReplaceProtectWithAllow

- ViewMethodsAsViews

- MergeProtectionAndComponentDefinitions

There were also various security fixes resulting of better integration
of security with components.


=== Zope3/lib/python/Zope/App/OFS/Services/RoleService/Views/Browser/Adder.py 1.1.4.1 => 1.1.4.2 ===
             Instantiate an object and put it in our folder.
         """
-        context = self.getContext()
+        context = self.context
         
         if id in context.objectIds():
             raise DuplicateIDError, "ID '%s' already in use." % id


=== Zope3/lib/python/Zope/App/OFS/Services/RoleService/Views/Browser/browser.zcml 1.1.4.2 => 1.1.4.3 ===
 >
 
-<security:protectClass 
-   class="Zope.App.OFS.Services.RoleService.Views.Browser.Contents."
-   permission_id="Zope.ManageServices" 
-   names="index, listContentInfo, remove, removeObjects, confirmRemoved"/>
-
-<browser:defaultView 
-   name="contents"
-   for="Zope.App.OFS.Services.RoleService.RoleService.IRoleService"
-   factory="Zope.App.OFS.Services.RoleService.Views.Browser.Contents." />
-
-<security:protectClass 
-   class="Zope.App.OFS.Services.RoleService.Views.Browser.Adder."
-   permission_id="Zope.ManageServices" 
-   names="index, confirmed, action, listAddableInfo"/>
-
-<browser:view 
-   name="adder"
-   for="Zope.App.OFS.Services.RoleService.RoleService.IRoleService"
-   factory="Zope.App.OFS.Services.RoleService.Views.Browser.Adder." />
-
-<zmi:tabs for="Zope.App.OFS.Services.RoleService.RoleService.IRoleService.">
-  <zmi:tab label="Contents" action="contents;view"/>
-</zmi:tabs>
+  <browser:defaultView 
+     for="Zope.App.OFS.Services.RoleService.RoleService.IRoleService"
+     name="index.html"
+     />
+
+  <browser:view 
+     permission="Zope.ManageServices" 
+     for="Zope.App.OFS.Services.RoleService.RoleService.IRoleService"
+     factory="Zope.App.OFS.Services.RoleService.Views.Browser.Contents.">
+
+     <browser:page name="index.html" attribute="index" />
+
+  </browser:view>
+
+  <browser:view 
+     name="adder"
+     permission="Zope.ManageServices" 
+     for="Zope.App.OFS.Services.RoleService.RoleService.IRoleService"
+     factory="Zope.App.OFS.Services.RoleService.Views.Browser.Adder."
+     >
+
+    <browser:page name="addForm.html"
+                  attribute="index"
+                  />
+    <browser:page name="add.html"
+                  attribute="action"
+                  />
+
+  </browser:view>
+
+  <zmi:tabs for="Zope.App.OFS.Services.RoleService.RoleService.IRoleService.">
+    <zmi:tab label="Contents" action="./view::index.html"/>
+  </zmi:tabs>
 
 </zopeConfigure>