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

[Bitbucket]

2 new changesets in ckan:

http://bitbucket.org/okfn/ckan/changeset/db6e4272781b/
changeset:   db6e4272781b
user:        rgrp
date:        2011-09-14 01:10:52
summary:     [js][s]: reinstate format autocomplete for resources.

* needed some cleverness to allow rebinding (as we re-render resources).
affected #:  2 files (68 bytes)

--- a/ckan/public/scripts/application.js	Tue Sep 13 23:01:53 2011 +0000
+++ b/ckan/public/scripts/application.js	Wed Sep 14 00:10:52 2011 +0100
@@ -4,7 +4,9 @@
     CKAN.Utils.setupAuthzGroupAutocomplete($('input.autocomplete-authzgroup'));
     CKAN.Utils.setupPackageAutocomplete($('input.autocomplete-dataset'));
     CKAN.Utils.setupTagAutocomplete($('input.autocomplete-tag'));
-    CKAN.Utils.setupFormatAutocomplete($('input.autocomplete-format'));
+    $('input.autocomplete-format').live('keyup', function(){
+      CKAN.Utils.setupFormatAutocomplete($(this));
+    });
     CKAN.Utils.setupMarkdownEditor($('.markdown-editor a, .markdown-editor .markdown-preview'));
     // set up ckan js
     var config = {


--- a/ckan/public/scripts/templates.js	Tue Sep 13 23:01:53 2011 +0000
+++ b/ckan/public/scripts/templates.js	Wed Sep 14 00:10:52 2011 +0100
@@ -104,7 +104,7 @@
       </dd> \
       <dt>Format</dt> \
       <dd> \
-        <input name="resources__${num}__format" type="text" value="${resource.format}" class="long" /> \
+        <input name="resources__${num}__format" type="text" value="${resource.format}" class="long autocomplete-format" /> \
       </dd> \
       <dt>Description</dt> \
       <dd> \


http://bitbucket.org/okfn/ckan/changeset/755b1a622199/
changeset:   755b1a622199
user:        rgrp
date:        2011-09-14 01:38:04
summary:     [templates/package/edit][s]: better error reporting for resource errors.
affected #:  1 file (433 bytes)

--- a/ckan/templates/package/new_package_form.html	Wed Sep 14 00:10:52 2011 +0100
+++ b/ckan/templates/package/new_package_form.html	Wed Sep 14 00:38:04 2011 +0100
@@ -9,7 +9,20 @@
 <h2>Errors in form</h2><p>The form contains invalid entries:</p><ul>
-  <li py:for="key, error in error_summary.items()">${"%s: %s" % (key, error)}</li>
+  <li py:for="key, error in error_summary.items()">${"%s: %s" % (key, error)}
+    <py:if test="key=='Resources'">
+      <ul>
+        <py:for each="idx, errordict in enumerate(errors.get('resources', []))">
+          <li py:if="errordict">
+            Resource ${idx}:
+            <ul>
+              <li py:for="thiskey, thiserror in errordict.items()">${thiskey}: <py:for each="errorinfo in thiserror">${errorinfo}; </py:for></li>
+            </ul>
+          </li>
+        </py:for>
+      </ul>
+    </py:if>
+  </li></ul></div>

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.