[#953] Move new dataset visibility to first stage

Move the visibility option (public or private) when creating a dataset
to the first stage of the dataset creation form. This fixes the issue
(#953) that an activity is emitted when creating private datasets. Since
the dataset is actually created when the first form is submitted, and
the public/private setting is not chosen until the third form, the
dataset is public at the moment when it's created and an activity is
emitted.

It seems to make a lot more sense fo the visibility option to be on the
first form next to the organization option anyway.

Fixes #953.

ckan/templates/package/snippets/package_basic_fields.html

@@ -71,4 +71,18 @@
     </div>
   {% endif %}
 {% endif %}
+
+{% block package_metadata_fields_visibility %}
+  <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>
+{% endblock %}
+
 {% endblock %}

ckan/templates/package/snippets/package_metadata_fields.html

@@ -2,21 +2,6 @@
 
 {% block package_metadata_fields %}
 
-{% block package_metadata_fields_visibility %}
-{% if data.owner_org %}
-  <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>
-{% endif %}
-{% endblock %}
-
 {% block package_metadata_author %}
 {{ form.input('author', label=_('Author'), id='field-author', placeholder=_('Joe Bloggs'), value=data.author, error=errors.author, classes=['control-medium']) }}