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

Wed Aug 3 22:06:07 UTC 2011

2 new changesets in ckan:

http://bitbucket.org/okfn/ckan/changeset/357cf9377b25/
changeset:   357cf9377b25
user:        kindly
date:        2011-08-04 00:05:17
summary:     [search] bug 1256, fix so that deleted state gets correctly added to modification object
affected #:  1 file (214 bytes)

--- a/ckan/logic/action/update.py	Tue Aug 02 22:10:06 2011 +0100
+++ b/ckan/logic/action/update.py	Wed Aug 03 23:05:17 2011 +0100
@@ -6,6 +6,7 @@
 from ckan.plugins import PluginImplementations, IGroupController, IPackageController
 from ckan.logic import NotFound, check_access, NotAuthorized, ValidationError
 from ckan.lib.base import _
+from vdm.sqlalchemy.base import SQLAlchemySession
 from ckan.lib.dictization.model_dictize import (package_dictize,
                                                 package_to_api1,
                                                 package_to_api2,
@@ -107,7 +108,9 @@
     latest_rev.current = True
     if latest_rev.state in ('pending-deleted', 'deleted'):
         latest_rev.state = 'deleted'
+        latest_rev.continuity.state = 'deleted'
     else:
+        latest_rev.continuity.state = 'active'
         latest_rev.state = 'active'
 
     session.add(latest_rev)
@@ -127,6 +130,7 @@
 
     model = context['model']
     session = model.Session
+    SQLAlchemySession.setattr(session, 'revisioning_disabled', True)
     id = data_dict["id"]
     pkg = model.Package.get(id)
 


http://bitbucket.org/okfn/ckan/changeset/141f189a1145/
changeset:   141f189a1145
user:        kindly
date:        2011-08-04 00:05:53
summary:     [merge] default
affected #:  3 files (159 bytes)

--- a/ckan/controllers/home.py	Wed Aug 03 23:05:17 2011 +0100
+++ b/ckan/controllers/home.py	Wed Aug 03 23:05:53 2011 +0100
@@ -49,11 +49,10 @@
         c.fields = []
         c.package_count = query.count
         c.latest_packages = current_package_list_with_resources({'model': model,
-                                                                'user': c.user,
-                                                                'limit': 5},
-                                                                 {})      
+                                                                 'user': c.user},
+                                                                 {'limit': 5})      
         return render('home/index.html', cache_key=cache_key,
-                cache_expire=cache_expires)
+                      cache_expire=cache_expires)
 
     def license(self):
         return render('home/license.html', cache_expire=cache_expires)


--- a/doc/install-from-package.rst	Wed Aug 03 23:05:17 2011 +0100
+++ b/doc/install-from-package.rst	Wed Aug 03 23:05:53 2011 +0100
@@ -4,9 +4,9 @@
 
 This section describes how to install CKAN from packages. This is the recommended and by far the easiest way to install CKAN.
 
-Package install requires you to use 64-bit Ubuntu 10.04: either locally, through a virtual machine or Amazon EC2. Your options are as follows:
+Package install requires you to use Ubuntu 10.04: either locally, through a virtual machine or Amazon EC2. Your options are as follows:
 
-* Using 64-bit Ubuntu 10.04 directly. 
+* Using Ubuntu 10.04 directly. 
 * :ref:`using-virtualbox`. This is suitable if you want to host your CKAN instance on a machine running any other OS. 
 * :ref:`using-amazon`. This is suitable if you want to host your CKAN instance in the cloud, on a ready-made Ubuntu OS.
 
@@ -17,7 +17,7 @@
 Prepare your System
 --------------------
 
-CKAN runs on 64-bit Ubuntu 10.04. If you are already using Ubuntu 10.04, you can continue straight to :ref:`run-package-installer`.
+CKAN runs on Ubuntu 10.04. If you are already using Ubuntu 10.04, you can continue straight to :ref:`run-package-installer`.
 
 However, if you're not, you can either use VirtualBox to set up an Ubuntu VM on Windows, Linux, Macintosh and Solaris. Alternatively, you can use an Amazon EC2 instance.
 
@@ -36,7 +36,7 @@
 Then download the installation files. 
 
 * `Download the VirtualBox installer <http://www.virtualbox.org/wiki/Downloads>`_.
-* `Download the Ubuntu image <http://www.ubuntu.com/download/ubuntu/download>`_ - make sure you choose Ubuntu 10.04 and 64-bit.
+* `Download the Ubuntu image <http://www.ubuntu.com/download/ubuntu/download>`_ - make sure you choose Ubuntu 10.04.
 
 Install VirtualBox
 ******************
@@ -62,7 +62,7 @@
    :width: 807px
    :alt: The VirtualBox installer - the New Virtual Machine Wizard
 
-Give your VM a name - we'll call ours ``ubuntu_ckan``. Under **OS Type**, choose **Linux** and **Ubuntu 64-bit**.
+Give your VM a name - we'll call ours ``ubuntu_ckan``. Under **OS Type**, choose **Linux** and **Ubuntu (32 or 64-bit)**.
 
 .. image:: images/virtualbox5-vmtype.png
    :width: 807px


--- a/doc/install-from-source.rst	Wed Aug 03 23:05:17 2011 +0100
+++ b/doc/install-from-source.rst	Wed Aug 03 23:05:53 2011 +0100
@@ -4,7 +4,7 @@
 
 This section describes how to install CKAN from source. This removes the requirement for Ubuntu 10.04 that exists with :doc:`install-from-package`.
 
-.. warning:: This option is more complex than :doc:`install-from-package`, so we suggest only doing it this way if you plan to work on CKAN core, or have no access to Ubuntu 10.04 via any of the suggested methods. 
+.. warning:: This option is more complex than :doc:`install-from-package`, so f you prefer simplicity we suggest installing from package. 
 
 For support during installation, please contact `the ckan-dev mailing list <http://lists.okfn.org/mailman/listinfo/ckan-dev>`_.

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.


