Import licenses from SPDX

Fixes #326
This commit is contained in:
rubenwardy
2021-07-31 21:03:45 +01:00
parent 2f2141f524
commit aae546a08e
7 changed files with 98 additions and 9 deletions

View File

@@ -12,12 +12,13 @@
<a class="btn btn-primary float-right" href="{{ url_for('admin.create_edit_license') }}">New License</a>
<a class="btn btn-secondary mb-4" href="{{ url_for('admin.license_list') }}">Back to list</a>
{% from "macros/forms.html" import render_field, render_submit_field %}
{% from "macros/forms.html" import render_field, render_checkbox_field, render_submit_field %}
<form method="POST" action="" enctype="multipart/form-data">
{{ form.hidden_tag() }}
{{ render_field(form.name) }}
{{ render_field(form.is_foss) }}
{{ render_checkbox_field(form.is_foss) }}
{{ render_field(form.url) }}
{{ render_submit_field(form.submit) }}
</form>
{% endblock %}

View File

@@ -16,6 +16,14 @@
{% endif %}
{% endblock %}
{% macro render_license(license) %}
{% if license.url %}
<a href="{{ license.url }}">{{ license.name }}</a>
{% else %}
{{ license.name }}
{% endif %}
{% endmacro %}
{% block container %}
{% if not package.license.is_foss and not package.media_license.is_foss and package.type != package.type.TXP %}
{% set package_warning="Non-free code and media" %}
@@ -363,12 +371,12 @@
<dt>{{ _("License") }}</dt>
<dd>
{% if package.license == package.media_license %}
{{ package.license.name }}
{{ render_license(package.license) }}
{% elif package.type == package.type.TXP %}
{{ package.media_license.name }}
{{ render_license(package.media_license) }}
{% else %}
{{ package.license.name }} for code,<br />
{{ package.media_license.name }} for media.
{{ render_license(package.license) }} for code,<br />
{{ render_license(package.media_license) }} for media.
{% endif %}
</dd>
<dt>Added</dt>