[ckan-changes] commit/ckan: 3 new changesets

[Bitbucket]

3 new changesets in ckan:

http://bitbucket.org/okfn/ckan/changeset/71ab26672643/
changeset:   71ab26672643
branch:      release-v1.4.3
user:        dread
date:        2011-07-28 17:23:43
summary:     [release]: branch.
affected #:  2 files (28 bytes)

--- a/ckan/__init__.py	Thu Jul 28 16:20:15 2011 +0100
+++ b/ckan/__init__.py	Thu Jul 28 16:23:43 2011 +0100
@@ -1,4 +1,4 @@
-__version__ = '1.4.3a'
+__version__ = '1.4.3b'
 __description__ = 'Comprehensive Knowledge Archive Network (CKAN) Software'
 __long_description__ = \
 '''The CKAN software is used to run the Comprehensive Knowledge Archive


--- a/pip-requirements.txt	Thu Jul 28 16:20:15 2011 +0100
+++ b/pip-requirements.txt	Thu Jul 28 16:23:43 2011 +0100
@@ -5,11 +5,11 @@
 # 
 #     pip install --ignore-installed -r pip-requirements.txt
 
--e hg+https://bitbucket.org/okfn/ckan@default#egg=ckan
+-e hg+https://bitbucket.org/okfn/ckan@release-v1.4.3#egg=ckan
 # CKAN dependencies
--r https://bitbucket.org/okfn/ckan/raw/default/requires/lucid_conflict.txt
--r https://bitbucket.org/okfn/ckan/raw/default/requires/lucid_present.txt
--r https://bitbucket.org/okfn/ckan/raw/default/requires/lucid_missing.txt
+-r https://bitbucket.org/okfn/ckan/raw/release-v1.4.3/requires/lucid_conflict.txt
+-r https://bitbucket.org/okfn/ckan/raw/release-v1.4.3/requires/lucid_present.txt
+-r https://bitbucket.org/okfn/ckan/raw/release-v1.4.3/requires/lucid_missing.txt
 
 # NOTE: Developers, please do not edit this file. Changes should go in the
 #       appropriate files in the `requires' directory.


http://bitbucket.org/okfn/ckan/changeset/976297eb656b/
changeset:   976297eb656b
user:        dread
date:        2011-07-28 17:26:50
summary:     [merge,release]: Merge from release branch and increment version number in anticipation of next version.
affected #:  2 files (0 bytes)

--- a/ckan/__init__.py	Thu Jul 28 16:20:15 2011 +0100
+++ b/ckan/__init__.py	Thu Jul 28 16:26:50 2011 +0100
@@ -1,4 +1,4 @@
-__version__ = '1.4.3a'
+__version__ = '1.4.4a'
 __description__ = 'Comprehensive Knowledge Archive Network (CKAN) Software'
 __long_description__ = \
 '''The CKAN software is used to run the Comprehensive Knowledge Archive


http://bitbucket.org/okfn/ckan/changeset/3da549acf96f/
changeset:   3da549acf96f
branch:      release-v1.4.3
user:        dread
date:        2011-07-28 17:45:02
summary:     [logic]: Backout of cset:03b9eb25778a because this change in authz is unnecessary right now and broke an authz test.
affected #:  1 file (99 bytes)

--- a/ckan/logic/action/get.py	Thu Jul 28 16:23:43 2011 +0100
+++ b/ckan/logic/action/get.py	Thu Jul 28 16:45:02 2011 +0100
@@ -2,7 +2,6 @@
 from sqlalchemy import or_, func, desc
 
 from ckan.logic import NotFound, check_access
-from ckan.model import Session
 from ckan.plugins import (PluginImplementations,
                           IGroupController,
                           IPackageController)
@@ -31,9 +30,7 @@
     api = context.get("api_version", '1')
     ref_package_by = 'id' if api == '2' else 'name'
 
-    query = Session.query(model.PackageRevision)
-    query = query.filter(model.PackageRevision.state=='active')
-    query = query.filter(model.PackageRevision.current==True)
+    query = ckan.authz.Authorizer().authorized_query(user, model.Package)
     packages = query.all()
     return [getattr(p, ref_package_by) for p in packages]
 
@@ -42,7 +39,7 @@
     user = context["user"]
     limit = data_dict.get("limit")
 
-    q = Session.query(model.PackageRevision)
+    q = ckan.authz.Authorizer().authorized_query(user, model.PackageRevision)
     q = q.filter(model.PackageRevision.state=='active')
     q = q.filter(model.PackageRevision.current==True)

Repository URL: https://bitbucket.org/okfn/ckan/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.