Skip to content
Snippets Groups Projects
Commit b175d806 authored by chbaeh's avatar chbaeh
Browse files

ODPSH-287: make license requiered

parent 9c701056
No related branches found
No related tags found
No related merge requests found
......@@ -179,7 +179,7 @@ def presorted_license_options(existing_license_id=None):
license_ids = [license.id for license in licenses]
if existing_license_id and existing_license_id not in license_ids:
license_ids.insert(0, existing_license_id)
return [
return [('','')]+[
(license_id,
register[license_id].title if license_id in register else license_id)
for license_id in license_ids]
No preview for this file type
......@@ -183,6 +183,9 @@ msgstr "Bitte geben Sie einen gültigen Zeitraum an"
msgid "Name: Fehlender Wert"
msgstr "Bitte geben Sie eine Url ein"
msgid "Lizenz: Fehlender Wert"
msgstr "Bitte geben Sie eine Lizenz an"
msgid "Raumbezug: Fehlender Wert"
msgstr "Bitte geben Sie einen Ort ein"
......
......@@ -310,7 +310,7 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm
'groups': _('Kategorie')})
def _update_schema(self, schema):
for field in ['title', 'notes']:
for field in ['title', 'notes','license_id']:
schema.update({field: [toolkit.get_converter('not_empty')]})
for i, item in enumerate(schema['tags']['name']):
......
......@@ -40,6 +40,7 @@ is_required=true,placeholder=_('Enter title')) }}
{% block package_basic_fields_license %}
<div class="control-group">
{% set error = errors.license_id %}
{% set error_string = _(_("License") + ': '+errors.license_id[0] ) if errors.license_id %}
<div class="controls">
<select id="field-license" name="license_id">
{% set existing_license_id = data.get('license_id') %}
......@@ -48,7 +49,6 @@ is_required=true,placeholder=_('Enter title')) }}
endif %}>{{ license_desc }}</option>
{% endfor %}
</select>
{% if error %}<span class="error-block">{{ error }}</span>{% endif %}
</div>
</div>
</div>
......@@ -63,9 +63,11 @@ is_required=true,placeholder=_('Enter title')) }}
</div>
</div>
</div>
{% if error_string %}
<div class="span6 inline-error">
{{error}}
{{_(error_string)}}
</div>
{% endif %}
</div>
{% endblock %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment