[#2939] Template fixes for dataset edits

ckan · Oct 3, 2012 · 5e403fd · 5e403fd
1 parent c8415c5
commit 5e403fd
Showing 1 changed file with 22 additions and 18 deletions.
diff --git a/ckan/templates/package/snippets/package_metadata_fields.html b/ckan/templates/package/snippets/package_metadata_fields.html
@@ -1,31 +1,35 @@
 {% import 'macros/form.html' as form %}
 
-{% set organizations_available = h.organizations_available() %}
-{% if organizations_available %}
+{% if h.check_access('sysadmin') or data.get('state', 'draft').startswith('draft') %}
+  {% set organizations_available = h.organizations_available() %}
+  {% if organizations_available %}
+    <div class="control-group">
+      <label for="field-organizations" class="control-label">{{ _('Organization') }}</label>
+      <div class="controls">
+        <select id="field-organizations" name="owner_org" data-module="autocomplete">
+          <option value="">{{ _('Select an organization...') }}</option>
+          {% for organization in organizations_available %}
+          <option value="{{ organization.id }}" {% if organization.id == data.owner_org%}selected="selected"{% endif %}>{{ organization.name }}</option>
+          {% endfor %}
+        </select>
+      </div>
+    </div>
+  {% endif %}
+{% endif %}
+
+{% if data.owner_org %}
   <div class="control-group">
-    <label for="field-organizations" class="control-label">{{ _('Organization') }}</label>
+    <label for="field-private" class="control-label">{{ _('Visibility') }}</label>
     <div class="controls">
-      <select id="field-organizations" name="owner_org" data-module="autocomplete">
-        <option value="">{{ _('Select an organization...') }}</option>
-        {% for organization in organizations_available %}
-        <option value="{{ organization.id }}" {% if organization.id == data.owner_org%}selected="selected"{% endif %}>{{ organization.name }}</option>
+      <select id="field-private" name="private" data-module="autocomplete">
+        {% for option in [(true, 'Private'), (false, 'Public')] %}
+        <option value="{{ option[0] }}" {% if option[0] == data.private%}selected="selected"{% endif %}>{{ option[1] }}</option>
         {% endfor %}
       </select>
     </div>
   </div>
 {% endif %}
 
-<div class="control-group">
-  <label for="field-private" class="control-label">{{ _('Visibility') }}</label>
-  <div class="controls">
-    <select id="field-private" name="private" data-module="autocomplete">
-      {% for option in [(true, 'Private'), (false, 'Public')] %}
-      <option value="{{ option[0] }}" {% if option[0] == data.private%}selected="selected"{% endif %}>{{ option[1] }}</option>
-      {% endfor %}
-    </select>
-  </div>
-</div>
-
 {{ form.input('author', label=_('Author'), id='field-author', placeholder=_('Joe Bloggs'), value=data.author, error=errors.author, classes=['control-medium']) }}
 
 {{ form.input('author_email', label=_('Author Email'), id='field-author-email', placeholder=_('joe@example.com'), value=data.author_email, error=errors.author_email, classes=['control-medium']) }}