Changeset 855:68630d75f031

Timestamp:

03/10/10 11:00:17 (6 months ago)

Author:

dread

Branch:

default

Parents:

854:b98ce3951f0a (diff), 851:514e8d444aec (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

[merge]

Files:

• ckan/controllers/group.py (modified) (1 diff)
• ckan/controllers/group.py (modified) (1 diff)
• ckan/controllers/package.py (modified) (1 diff)
• ckan/controllers/package.py (modified) (2 diffs)
• doc/syncing.rst (deleted)

ckan/controllers/group.py

@@ -89 +89 @@
             fs = fs.bind(data=data)
         c.form = self._render_edit_form(fs)
-        if 'preview' in request.params:
-            c.preview = genshi.HTML(self._render_package(fs))
         return render('group/new')
 

ckan/controllers/group.py

@@ -15 +15 @@
         from ckan.lib.helpers import Page
 
+        query = ckan.authz.Authorizer().authorized_query(c.user, model.Group)
         c.page = Page(
-            collection=model.Session.query(model.Group),
+            collection=query,
             page=request.params.get('page', 1),
             items_per_page=20

ckan/controllers/package.py

@@ -287 +287 @@
 
         # retrieve pkg again ...
-        pkg = model.Package.by_name(id)
-        fs = ckan.forms.package_authz_fs.bind(pkg.roles)
+        c.pkg = model.Package.by_name(id)
+        fs = ckan.forms.package_authz_fs.bind(c.pkg.roles)
         c.form = fs.render()
         c.new_roles_form = ckan.forms.new_package_roles_fs.render()

ckan/controllers/package.py

@@ -21 +21 @@
 
     def index(self):
-        c.package_count = model.Session.query(model.Package).count()
+        query = ckan.authz.Authorizer().authorized_query(c.user, model.Package)
+        c.package_count = query.count()
         return render('package/index')
 
     def list(self):
+        query = ckan.authz.Authorizer().authorized_query(c.user, model.Package)
         c.page = Page(
-            collection=model.Package.active(),
+            collection=query,
             page=request.params.get('page', 1),
             items_per_page=50
@@ -43 +45 @@
                 })
             # package search
-            query = Search().query(options)
+            query = Search().query(options, username=c.user)
             c.page = Page(
                 collection=query,