Changeset 6405 for main

Timestamp:

19 Jun 2011, 12:43:05 (14 years ago)

Author:

Henrik Bettermann

Message:

We don't need to search the academics section so far.

Location:

main/waeup.sirp/branches/accesscodes-with-workflow/src/waeup/sirp

Files:

• browser/pages.py (modified) (2 diffs)
• browser/test_permissions.py (modified) (1 diff)
• university/catalog.py (modified) (1 diff)

main/waeup.sirp/branches/accesscodes-with-workflow/src/waeup/sirp/browser/pages.py

@@ -37 +37 @@
     ILocalRolesAssignable, DuplicationError)
 from waeup.sirp.permissions import get_users_with_local_roles, getRoles
-from waeup.sirp.university.catalog import search
+#from waeup.sirp.university.catalog import search
 from waeup.sirp.university.vocabularies import course_levels
 from waeup.sirp.users import LocalRoleSetEvent
@@ -347 +347 @@
 
 
-class SearchPage(WAeUPPage):
-    grok.context(IUniversity)
-    grok.name('search')
-    grok.template('searchpage')
-    grok.require('waeup.manageUniversity')
-    title = u"Site Search"
-    pnav = 2
-
-    def update(self, *args, **kw):
-        form = self.request.form
-        self.hitlist = []
-        self.query = ''
-        if not 'query' in form:
-            return
-        query = form['query']
-        self.query = query
-        self.hitlist = search(query=self.query, view=self)
-        return
+#class SearchPage(WAeUPPage):
+#    grok.context(IUniversity)
+#    grok.name('search')
+#    grok.template('searchpage')
+#    grok.require('waeup.manageUniversity')
+#    title = u"Site Search"
+#    pnav = 2
+
+#    def update(self, *args, **kw):
+#        form = self.request.form
+#        self.hitlist = []
+#        self.query = ''
+#        if not 'query' in form:
+#            return
+#        query = form['query']
+#        self.query = query
+#        self.hitlist = search(query=self.query, view=self)
+#        return
 
 #

main/waeup.sirp/branches/accesscodes-with-workflow/src/waeup/sirp/browser/test_permissions.py

@@ -20 +20 @@
 manager_pages = [
     # The pages that should only be accessible by manager...
-    '/@@manage', '/@@administration', '/@@searchstudent', '/@@search',
+    '/@@manage', '/@@administration', '/@@searchstudent',
     '/users/@@index', '/users/@@add', '/users/alice/@@index',
     '/datacenter/@@index', '/datacenter/@@upload', '/datacenter/@@import1',

main/waeup.sirp/branches/accesscodes-with-workflow/src/waeup/sirp/university/catalog.py

@@ -92 +92 @@
     return
 
-class CourseQueryResultItem(QueryResultItem):
-    def __init__(self, context, view):
-        self.context = context
-        self.url = view.url(context)
-        self.title = "COURSE: " + context.title
-        self.description = 'code: %s' % context.code
+#class CourseQueryResultItem(QueryResultItem):
+#    def __init__(self, context, view):
+#        self.context = context
+#        self.url = view.url(context)
+#        self.title = "COURSE: " + context.title
+#        self.description = 'code: %s' % context.code
 
-def search(query=None, view=None):
-    if not query:
-        return []
-    cat = getUtility(ICatalog, name='courses_catalog')
-    results = list(cat.searchResults(code=(query, query)))
+#def search(query=None, view=None):
+#    if not query:
+#        return []
+#    cat = getUtility(ICatalog, name='courses_catalog')
+#    results = list(cat.searchResults(code=(query, query)))
 
-    hitlist = []
-    results = Query().searchResults(
-        Eq(('courses_catalog', 'code'), query))
-    for result in results:
-        hitlist.append(CourseQueryResultItem(result, view=view))
+#    hitlist = []
+#    results = Query().searchResults(
+#        Eq(('courses_catalog', 'code'), query))
+#    for result in results:
+#        hitlist.append(CourseQueryResultItem(result, view=view))
 
-    results = Query().searchResults(
-        Text(('courses_catalog', 'title'), query))
+#    results = Query().searchResults(
+#        Text(('courses_catalog', 'title'), query))
 
-    for result in results:
-        hitlist.append(CourseQueryResultItem(result, view=view))
+#    for result in results:
+#        hitlist.append(CourseQueryResultItem(result, view=view))
 
-    return hitlist
+#    return hitlist