Changeset 7172 for main/waeup.sirp/trunk/src/waeup/sirp/browser

Timestamp:

22 Nov 2011, 17:39:35 (13 years ago)

Author:

Henrik Bettermann

Message:

Rename UserContainer? to UsersContainer? to be in line with ApplicantsContainer?, StudentsContainer?, HostelsCointainer?, PaymentsContainer?. In other words, a userscontainer contains users and it's not the container of a user. This is not really necessary in terms of English grammar but it helps to confuse container types.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/browser

Files:

• breadcrumbs.py (modified) (1 diff)
• breadcrumbs.txt (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• pages.py (modified) (3 diffs)
• templates/userscontainerpage.pt (moved) (moved from main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/usercontainerpage.pt)
• viewlets.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/browser/breadcrumbs.py

@@ -124 +124 @@
         return 'Session %s' % session_string
 
-class UserContainerBreadcrumb(Breadcrumb):
+class UsersContainerBreadcrumb(Breadcrumb):
     """A breadcrumb for user containers.
     """
-    grok.context(interfaces.IUserContainer)
+    grok.context(interfaces.IUsersContainer)
     title = u'Portal Users'
     parent_viewname = 'administration'

main/waeup.sirp/trunk/src/waeup/sirp/browser/breadcrumbs.txt

@@ -120 +120 @@
     [<...breadcrumbs.UniversityBreadcrumb object at 0x...>,
      <...breadcrumbs.AdministrationBreadcrumb object at 0x...>,
-     <...breadcrumbs.UserContainerBreadcrumb object at 0x...>]
+     <...breadcrumbs.UsersContainerBreadcrumb object at 0x...>]
 
 

main/waeup.sirp/trunk/src/waeup/sirp/browser/interfaces.py

@@ -4 +4 @@
 from zope.interface import Interface, Attribute
 from waeup.sirp.interfaces import (
-    IWAeUPObject, IUniversity, IUserContainer, IDataCenter)
+    IWAeUPObject, IUniversity, IUsersContainer, IDataCenter)
 from waeup.sirp.university.interfaces import (
     IFacultyContainer, IFaculty, IFacultyAdd, IDepartment, IDepartmentAdd, 

main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py

@@ -32 +32 @@
 from waeup.sirp.browser.resources import warning, datepicker, tabs, datatable
 from waeup.sirp.interfaces import(
-    IWAeUPObject, IUserContainer, IUserAccount, IDataCenter,
+    IWAeUPObject, IUsersContainer, IUserAccount, IDataCenter,
     IWAeUPXMLImporter, IWAeUPXMLExporter, IBatchProcessor,
     ILocalRolesAssignable, DuplicationError, IConfigurationContainer,
@@ -245 +245 @@
 #
 
-class UserContainerPage(WAeUPPage):
+class UsersContainerPage(WAeUPPage):
     """Overview page for all local users.
     """
     grok.require('waeup.manageUsers')
-    grok.context(IUserContainer)
+    grok.context(IUsersContainer)
     grok.name('index')
     title = 'Portal Users'
@@ -262 +262 @@
 class AddUserFormPage(WAeUPAddFormPage):
     grok.require('waeup.manageUsers')
-    grok.context(IUserContainer)
+    grok.context(IUsersContainer)
     grok.name('add')
     grok.template('usereditformpage')

main/waeup.sirp/trunk/src/waeup/sirp/browser/viewlets.py

@@ -10 +10 @@
 from waeup.sirp.browser.pages import (
     UniversityPage, FacultyContainerPage, DatacenterPage, FacultyPage,
-    DepartmentPage, CoursePage, CertificatePage, CertificateCoursePage, UserContainerPage)
+    DepartmentPage, CoursePage, CertificatePage, CertificateCoursePage, UsersContainerPage)
 from waeup.sirp.browser.interfaces import (
     IFacultyContainer, IFaculty, IDepartment, ICourse, ICertificate,
-    ICertificateCourse, IBreadcrumbContainer, IUniversity, IUserContainer)
+    ICertificateCourse, IBreadcrumbContainer, IUniversity, IUsersContainer)
 from waeup.sirp.interfaces import (IWAeUPObject, IWAeUPXMLExporter,
                                    IWAeUPXMLImporter, IDataCenter)
@@ -422 +422 @@
 class AddUserActionButton(AddActionButton):
     grok.require('waeup.manageUsers')
-    grok.context(IUserContainer)
-    grok.view(UserContainerPage)
+    grok.context(IUsersContainer)
+    grok.view(UsersContainerPage)
     text = 'Add user'