ODPSH-152: error string

ckanext/odsh/fanstatic/odsh_guessformat.js

@@ -7,6 +7,7 @@ ckan.module('odsh_guessformat', function ($)
     let c = $('#field-format')
     let onChange = function (filename)
     {
+            console.log(known_formats)
         let ext = filename.slice((filename.lastIndexOf(".") - 1 >>> 0) + 2).toLowerCase();
         if (ext !== undefined && known_formats.indexOf(ext) > -1)
         {

ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po

@@ -210,6 +210,9 @@ msgstr "Bitte geben sie einen Namen für den Datensatz ein"
 msgid "odsh_resource_description_error_label"
 msgstr "Bitte beschreiben Sie Ihren Datensatz"
 
+msgid "odsh_resource_format_error_label"
+msgstr "Bitte geben Sie ein Format an"
+
 msgid "Followers"
 msgstr "Abonennten"
 

ckanext/odsh/plugin.py

@@ -265,7 +265,8 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm
                 schema['tag_string'][i] = odsh_tag_string_convert
 
         schema['resources'].update({
-                'url' : [ toolkit.get_converter('not_empty') ]
+                'url' : [ toolkit.get_converter('not_empty') ],
+                'format' : [ toolkit.get_converter('not_empty') ]
                 })
 
     def create_package_schema(self):

ckanext/odsh/templates/macros/form.html

@@ -27,11 +27,15 @@ is_required=false) %}
 {% call input_block(id or name, label, error, classes, extra_html=extra_html, is_required=is_required) %}
 <div class="row-fluid">
     <div class="span6">
-    <input id="{{ id or name }}" type="{{ _type }}" name="{{ name }}" value="{{ value | empty_and_escape }}" placeholder="{{ placeholder }}"
-	   {{ onFocus }} {{ attributes(attrs) }} />
+        <input id="{{ id or name }}" type="{{ _type }}" name="{{ name }}" value="{{ value | empty_and_escape }}"
+            placeholder="{{ placeholder }}" {{ onFocus }} {{ attributes(attrs) }} />
     </div>
     <div class="span6 inline-error">
+        {% if error is string %}
         {{error}}
+        {% else %}
+        {{error|first}}
+        {% endif %}
     </div>
 </div>
 {% endcall %}

ckanext/odsh/templates/package/snippets/resource_form.html

-
 {% resource 'odsh/odsh_image-upload.js' %}
 {% import 'macros/form.html' as form %}
 
@@ -72,12 +71,9 @@
       {% resource 'odsh/odsh_guessformat.js' %}
 
       {% set format_attrs = {'data-module': 'odsh_guessformat', 'data-module-formats':h.odsh_upload_known_formats()} %}
+      {% set error_string = _('odsh_resource_format_error_label') if errors.format %}
 
-      {% call form.input('format', id='field-format', label=_('Format'), placeholder=_('eg. CSV, XML or JSON'), value=data.format, error=errors.format, classes=['control-medium'],attrs=format_attrs) %}
-        <span class="info-block info-block-small">
-          <i class="fa fa-info-circle"></i>
-          {{ _('This will be guessed automatically. Leave blank if you wish') }}
-        </span>
+      {% call form.input('format', id='field-format', label=_('Format'), placeholder=_('eg. CSV, XML or JSON'), value=data.format, error=error_string, classes=['control-medium'],attrs=format_attrs) %}
       {% endcall %}
     {% endblock %}
     {% endblock %}