[ckan-changes] [okfn/ckan] 4f809b: allow unselected_facet_items() in helpers

Wed May 2 11:50:03 UTC 2012

Branch: refs/heads/release-v1.7
  Home:   https://github.com/okfn/ckan
  Commit: 4f809ba573a72feff7af6161f5e21f31eb98c462
      https://github.com/okfn/ckan/commit/4f809ba573a72feff7af6161f5e21f31eb98c462
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  allow unselected_facet_items() in helpers

diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py
index 408b912..541c367 100644
--- a/ckan/lib/helpers.py
+++ b/ckan/lib/helpers.py
@@ -799,6 +799,7 @@ def process_names(items):
            'snippet',
            'convert_to_dict',
            'activity_div',
+           'unselected_facet_items',
     # imported into ckan.lib.helpers
            'literal',
            'link_to',


================================================================
  Commit: 01ba1e70c5580e3506682e8a25f42293c6ac6d30
      https://github.com/okfn/ckan/commit/01ba1e70c5580e3506682e8a25f42293c6ac6d30
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  [xs] fix tracking js error


diff --git a/ckan/templates/layout_base.html b/ckan/templates/layout_base.html
index dedd7b7..b6b4f46 100644
--- a/ckan/templates/layout_base.html
+++ b/ckan/templates/layout_base.html
@@ -269,7 +269,9 @@ <h3 class="widget-title">Meta</h3>
                  // Tracking
 				 var url = location.pathname;
 				 // remove any site root from url
-				 url = url.substring(CKAN.SITE_URL.length, url.length - 1);
+				 url = url.substring(CKAN.SITE_URL.length, url.length);
+				 // trim any trailing /
+				 url = url.replace(/\/*$/, '');
 				 $.ajax({url : CKAN.SITE_URL_NO_LOCALE + '/_tracking',
 						 type : 'POST',
 						 data : {url:url, type:'page'},


================================================================
  Commit: db95e2f615300fc38e84d58d89e2ff753e54c923
      https://github.com/okfn/ckan/commit/db95e2f615300fc38e84d58d89e2ff753e54c923
  Author: amercader <amercadero at gmail.com>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    M doc/commenting.rst
    M doc/deployment.rst
    M doc/forms.rst
    M doc/linked-data-and-rdf.rst
    M doc/publisher-profile.rst

  Log Message:
  -----------
  [doc] Bump 1.6.1 mentions


diff --git a/doc/commenting.rst b/doc/commenting.rst
index 5db444f..0f8d1b3 100644
--- a/doc/commenting.rst
+++ b/doc/commenting.rst
@@ -17,7 +17,7 @@ Once installed and enabled, the presence of comments on a given page is
 configured by your theme (see the documentation in the disqus extension for
 details).
 
-In the default CKAN theme (as of v1.6.1), comments will be shown only on dataset
+In the default CKAN theme (as of v1.7), comments will be shown only on dataset
 and resource pages (and recent comments only on the
 :doc:`administrative-dashboard`).
 
diff --git a/doc/deployment.rst b/doc/deployment.rst
index 2ee41dd..e144085 100644
--- a/doc/deployment.rst
+++ b/doc/deployment.rst
@@ -28,7 +28,7 @@ deployment configurations including:
 Deploying CKAN on an Ubuntu Server using Apache and modwsgi
 ===========================================================
 
-These instructions have been tested on Ubuntu 10.04 with CKAN 1.6.1.
+These instructions have been tested on Ubuntu 10.04 with CKAN 1.7.
 
 This is the standard way to deploy CKAN.
 
diff --git a/doc/forms.rst b/doc/forms.rst
index 22180fe..0355e17 100644
--- a/doc/forms.rst
+++ b/doc/forms.rst
@@ -130,7 +130,7 @@ Custom Schemas
 --------------
 
 .. note::
-    As of CKAN 1.6.1 custom schema functions apply to both the web user interface
+    As of CKAN 1.7 custom schema functions apply to both the web user interface
     and the API.
 
     An example of the use of these methods can be found in the ``ckanext-example`` extension.
diff --git a/doc/linked-data-and-rdf.rst b/doc/linked-data-and-rdf.rst
index 7fa4c68..4ab0bab 100644
--- a/doc/linked-data-and-rdf.rst
+++ b/doc/linked-data-and-rdf.rst
@@ -12,12 +12,12 @@ Enabling and Configuring Linked Data Support
 
 In CKAN <= 1.6 please install the RDF extension: https://github.com/okfn/ckanext-rdf
 
-In CKAN >= 1.6.1, basic RDF support will be available directly in core.
+In CKAN >= 1.7, basic RDF support will be available directly in core.
 
 Configuration
 -------------
 
-When using the built-in RDF support (CKAN >= 1.6.1) there is no configuration required.  By default requests for RDF data will return the RDF generated from the built-in 'packages/read.rdf' template, which can be overridden using the extra-templates directive.
+When using the built-in RDF support (CKAN >= 1.7) there is no configuration required.  By default requests for RDF data will return the RDF generated from the built-in 'packages/read.rdf' template, which can be overridden using the extra-templates directive.
 
 Accessing Linked Data
 =====================
diff --git a/doc/publisher-profile.rst b/doc/publisher-profile.rst
index 820ea56..a75728a 100644
--- a/doc/publisher-profile.rst
+++ b/doc/publisher-profile.rst
@@ -2,7 +2,7 @@
 Publisher Profile and Workflow
 ==============================
 
-.. versionadded:: 1.6.1
+.. versionadded:: 1.7
 
 The Publisher/Organization workflow in CKAN is designed to support a setup in which datasets
 are managed by a "Publisher" organization. Users can become members of one (or


================================================================
Compare: https://github.com/okfn/ckan/compare/81db6bb...db95e2f
