refactor validation

ckanext/odsh/fanstatic/odsh_form.js

@@ -30,13 +30,14 @@ ckan.module('odsh_form', function ($)
                 // TODO: this implementation should be more generic
                 var id = '#field-license';
                 var id_name = '#field-licenseAttributionByText-value';
+                var autofill=this.options.autofill
                 var toggle = function ()
                 {
                     let text = $(id + ' option:selected').text()
                     if (text.indexOf('Namensnennung') !== -1)
                     {
                         $(id_name).prop('disabled', false);
-                        if (!$(id_name).val())
+                        if (!$(id_name).val()&&autofill)
                             $(id_name).val($('#field-organizations option:selected').text());
                     } else
                     {

ckanext/odsh/helpers.py

@@ -165,7 +165,8 @@ def odsh_extract_error_new(key, errors):
     if not errors or not ('__extras' in errors):
         return None
     error = errors['__extras'][0].get(key,None)
-    return error
+    if error:
+        return key + ': ' + error
 
 def odsh_extract_value_from_extras(extras, key):
     if not extras:

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

@@ -235,9 +235,14 @@ msgstr "Bitte geben Sie ein Format an"
 msgid "odsh_licence_text_missing_error_label"
 msgstr "Bitte geben Sie einen Namen an"
 
+msgid "licenseAttributionByText: empty not allowed"
+msgstr "Bitte geben Sie einen Namen an"
+
 msgid "odsh_licence_text_not_allowed_error_label"
 msgstr "Ein Name ist bei dieser Lizenz nicht zulässig"
 
+msgid "licenseAttributionByText: text not allowed for this license"
+msgstr "Ein Name ist bei dieser Lizenz nicht zulässig"
 
 msgid "Followers"
 msgstr "Abonennten"
@@ -351,5 +356,5 @@ msgstr "verwendet URIs"
 msgid "4LD"
 msgstr "Linked Data"
 
-msgid "at least one group needed"
+msgid "groups: at least one group needed"
 msgstr "Bitte geben Sie mindestens eine Kategorie an"
\ No newline at end of file

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

@@ -59,7 +59,7 @@ is_required=true,placeholder=_('Enter title')) }}
 
 
     <!-- field license -->
-    {% set error_missing_attr = h.odsh_extract_error('licenseAttributionByText', errors) %}
+    {% set error_missing_attr = h.odsh_extract_error_new('licenseAttributionByText', errors) %}
     <label class="control-label" for="field-license">
         {{ _("License") }}:
         <span title="{{ _("This field is required") }}" class="control-required">*</span>
@@ -88,7 +88,7 @@ is_required=true,placeholder=_('Enter title')) }}
             <div class="control-group {{ " error" if error_missing_attr }} control-full">
                 <div class="controls">
                             {{ form.input_extra(field, value=value, index=h.odsh_create_checksum(field), type='text', attrs={'disabled':true,
-            'data-module':"odsh_form", 'data-module-licensetoggle':'true' }, placeholder=_('enter name')) }}
+            'data-module':"odsh_form", 'data-module-licensetoggle':'true', 'data-module-autofill':'true'}, placeholder=_('enter name')) }}
                 </div>
             </div>
         </div>
@@ -172,7 +172,7 @@ is_required=true,placeholder=_('Enter title')) }}
                 </div>
                 <div class="span6 inline-error">
                     {% if error %} 
-                    {{_('issued: ' + error)}}
+                    {{_(error)}}
                     {% endif %}
                 </div>
             </div>