Merge branch '2375-demo-organizations' of https://github.com/okfn/ckan …

…into 2375-demo-organizations
ckan · Sep 13, 2012 · f74350c · f74350c
2 parents 253f820 + 4d7c98e
commit f74350c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ckan/logic/auth/organization/delete.py b/ckan/logic/auth/organization/delete.py
@@ -1,6 +1,7 @@
 import ckan.logic as logic
 from ckan.logic.auth import get_package_object, get_group_object, \
-    get_user_object, get_resource_object, get_related_object
+    get_user_object, get_resource_object, get_related_object, \
+    get_organization_object
 from ckan.logic.auth.organization import _groups_intersect
 from ckan.logic.auth.organization.create import package_relationship_create
 from ckan.authz import Authorizer

diff --git a/ckan/templates/organization/snippets/organization_form.html b/ckan/templates/organization/snippets/organization_form.html
@@ -9,7 +9,7 @@
     {% set attrs = {'data-module': 'slug-preview-target'} %}
     {{ form.input('title', label=_('Title'), id='field-title', placeholder=_('My Organization'), value=data.title, error=errors.title, classes=['control-full'], attrs=attrs) }}
 
-    <input type='hidden' name='id' id='id' value="{{data.get('id')}}">
+    <input type="hidden" name="id" id="id" value="{{data.get('id')}}">
 
     {# Perhaps these should be moved into the controller? #}
     {% set prefix = h.url_for(controller='organization', action='read', id='') %}