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

[Bitbucket]

3 new changesets in ckan:

http://bitbucket.org/okfn/ckan/changeset/63e6a718ad0b/
changeset:   63e6a718ad0b
branch:      feature-1141-moderated-edits-ajax
user:        kindly
date:        2011-06-11 15:00:50
summary:     [moderated edits] change indexes to use current
affected #:  1 file (90 bytes)

--- a/ckan/migration/versions/039_add_expired_id_and_dates.py	Thu Jun 09 18:58:44 2011 +0100
+++ b/ckan/migration/versions/039_add_expired_id_and_dates.py	Sat Jun 11 14:00:50 2011 +0100
@@ -103,7 +103,7 @@
 update package_revision set current = '1' where expired_timestamp = '9999-12-31';
 
 create index idx_package_period on package_revision(revision_timestamp, expired_timestamp, id);
-create index idx_package_expired on package_revision(expired_timestamp);
+create index idx_package_current on package_revision(current);
 
 --package extra revision 
 truncate tmp_expired_id;
@@ -115,7 +115,7 @@
 
 create index idx_package_extra_period on package_extra_revision(revision_timestamp, expired_timestamp, id);
 create index idx_package_extra_period_package on package_extra_revision(revision_timestamp, expired_timestamp, package_id);
-create index idx_package_extra_expired on package_extra_revision(expired_timestamp);
+create index idx_package_extra_current on package_extra_revision(current);
 
 --package group revision
 truncate tmp_expired_id;
@@ -126,7 +126,7 @@
 update package_group_revision set current = '1' where expired_timestamp = '9999-12-31';
 
 create index idx_package_group_period_package_group on package_group_revision(revision_timestamp, expired_timestamp, package_id, group_id);
-create index idx_package_group_expired on package_group_revision(expired_timestamp);
+create index idx_package_group_current on package_group_revision(current);
 
 
 -- package_tags
@@ -138,7 +138,7 @@
 update package_tag_revision set current = '1' where expired_timestamp = '9999-12-31';
 
 create index idx_period_package_tag on package_tag_revision(revision_timestamp, expired_timestamp, package_id, tag_id);
-create index idx_package_tag_expired on package_tag_revision(expired_timestamp);
+create index idx_package_tag_current on package_tag_revision(current);
 
 -- package relationship
 truncate tmp_expired_id;
@@ -149,7 +149,7 @@
 update package_relationship_revision set current = '1' where expired_timestamp = '9999-12-31';
 
 create index idx_period_package_relationship on package_relationship_revision(revision_timestamp, expired_timestamp, object_package_id, subject_package_id);
-create index idx_package_relationship_expired on package_relationship_revision(expired_timestamp);
+create index idx_package_relationship_current on package_relationship_revision(current);
 
 -- resource revision
 truncate tmp_expired_id;
@@ -161,7 +161,7 @@
 
 create index idx_resource_period on resource_revision(revision_timestamp, expired_timestamp, id);
 create index idx_resource_period_resource_group on resource_revision(revision_timestamp, expired_timestamp, resource_group_id);
-create index idx_resource_expired on resource_revision(expired_timestamp);
+create index idx_resource_current on resource_revision(current);
 
 -- resource group revision;
 truncate tmp_expired_id;
@@ -173,7 +173,7 @@
 
 create index idx_resource_group_period on resource_group_revision(revision_timestamp, expired_timestamp, id);
 create index idx_resource_group_period_package on resource_group_revision(revision_timestamp, expired_timestamp, package_id);
-create index idx_resource_group_expired on resource_group_revision(expired_timestamp);
+create index idx_resource_group_current on resource_group_revision(current);
 
 --group revision;
 truncate tmp_expired_id;
@@ -184,7 +184,7 @@
 update group_revision set current = '1' where expired_timestamp = '9999-12-31';
 
 create index idx_group_period on group_revision(revision_timestamp, expired_timestamp, id);
-create index idx_group_expired on group_revision(expired_timestamp);
+create index idx_group_current on group_revision(current);
 
 --group extra revision 
 truncate tmp_expired_id;
@@ -196,7 +196,7 @@
 
 create index idx_group_extra_period on group_extra_revision(revision_timestamp, expired_timestamp, id);
 create index idx_group_extra_period_group on group_extra_revision(revision_timestamp, expired_timestamp, group_id);
-create index idx_group_extra_expired on group_extra_revision(expired_timestamp);
+create index idx_group_extra_current on group_extra_revision(current);
 
 drop table tmp_expired_id;
 


http://bitbucket.org/okfn/ckan/changeset/00a505338310/
changeset:   00a505338310
branch:      release-v1.4.1
user:        kindly
date:        2011-06-12 21:17:18
summary:     [model] allow no resource groups
affected #:  1 file (69 bytes)

--- a/ckan/model/package.py	Fri Jun 10 22:31:04 2011 +0100
+++ b/ckan/model/package.py	Sun Jun 12 20:17:18 2011 +0100
@@ -74,8 +74,10 @@
 
     @property
     def resources(self):
+        if len(self.resource_groups_all) == 0:
+            return []
+
         assert len(self.resource_groups_all) == 1, "can only use resources on packages if there is only one resource_group"
-
         return self.resource_groups_all[0].resources
     
     def update_resources(self, res_dicts, autoflush=True):


http://bitbucket.org/okfn/ckan/changeset/17ca3ed55e97/
changeset:   17ca3ed55e97
branch:      release-v1.4.1
user:        kindly
date:        2011-06-12 21:18:17
summary:     [branch merge]
affected #:  1 file (138 bytes)

--- a/requires/lucid_missing.txt	Sun Jun 12 20:17:18 2011 +0100
+++ b/requires/lucid_missing.txt	Sun Jun 12 20:18:17 2011 +0100
@@ -13,6 +13,8 @@
 -e git+https://github.com/wwaites/autoneg.git@b4c727b164f411cc9d60#egg=autoneg
 # flup>=0.5
 -e hg+http://hg.saddi.com/flup@301a58656bfb#egg=flup
+# All the conflicting dependencies from the lucid_conflict.txt file
+-e hg+https://bitbucket.org/okfn/ckan-deps@e6f853c0f500#egg=ckan-deps
 
 # NOTE: Developers, our build script for the Debian packages relies on the 
 #       requirements above being specified as editable resources with their

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.