Fixed module paths
This commit is contained in:
parent
29bdebf3ed
commit
521b3fd6c5
@ -31,12 +31,12 @@ class ProjectForm(forms.ModelForm, BaseForm):
|
|||||||
class Meta:
|
class Meta:
|
||||||
model = models.Project
|
model = models.Project
|
||||||
fields = ["name", "description", "modules", "event_date"]
|
fields = ["name", "description", "modules", "event_date"]
|
||||||
# widgets = {
|
widgets = {"event_date": forms.DateTimeInput()}
|
||||||
# 'event_date': forms.DateTimeInput(attrs={'type': 'date'})
|
|
||||||
# }
|
|
||||||
|
|
||||||
modules = forms.MultipleChoiceField(
|
modules = forms.MultipleChoiceField(
|
||||||
choices=[(x, x.title()) for x in models.settings.POLYPHONIC_MODULES],
|
choices=[
|
||||||
|
(x, x.replace(".", " ").title()) for x in models.settings.POLYPHONIC_MODULES
|
||||||
|
],
|
||||||
widget=forms.CheckboxSelectMultiple,
|
widget=forms.CheckboxSelectMultiple,
|
||||||
required=False,
|
required=False,
|
||||||
)
|
)
|
||||||
|
|||||||
@ -192,8 +192,9 @@ class Project(models.Model):
|
|||||||
class Module(models.Model):
|
class Module(models.Model):
|
||||||
"""Enable modules on a oriject"""
|
"""Enable modules on a oriject"""
|
||||||
|
|
||||||
name = models.SlugField(
|
name = models.CharField(
|
||||||
max_length=20, choices=[(x, x.title()) for x in settings.POLYPHONIC_MODULES]
|
max_length=100,
|
||||||
|
choices=[(x, x.replace(".", " ").title()) for x in settings.POLYPHONIC_MODULES],
|
||||||
)
|
)
|
||||||
project = models.ForeignKey(
|
project = models.ForeignKey(
|
||||||
Project, related_name="modules", on_delete=models.CASCADE
|
Project, related_name="modules", on_delete=models.CASCADE
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
<p class="menu-label">This Project</p>
|
<p class="menu-label">This Project</p>
|
||||||
<ul class="menu-list">
|
<ul class="menu-list">
|
||||||
<li><a role="tab" href="{% url 'project_detail' project=project.id %}">Project Info</a></li>
|
<li><a role="tab" href="{% url 'project_detail' project=project.id %}">Project Info</a></li>
|
||||||
{% if 'library' in modules %}
|
{% if 'polyphonic.library' in modules %}
|
||||||
<li><a class="nav-link" href="{% url 'item_list' project=project.pk %}">My Music</a></li>
|
<li><a class="nav-link" href="{% url 'item_list' project=project.pk %}">My Music</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% for page in project.wiki_pages.all %}
|
{% for page in project.wiki_pages.all %}
|
||||||
|
|||||||
@ -29,7 +29,7 @@
|
|||||||
</h3>
|
</h3>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<div class="block">
|
<div class="block content">
|
||||||
{% if project.description %}
|
{% if project.description %}
|
||||||
<p class="content">{{ project.description|markdown }}</p>
|
<p class="content">{{ project.description|markdown }}</p>
|
||||||
{% else %}
|
{% else %}
|
||||||
@ -40,40 +40,36 @@
|
|||||||
{% if project.owner %}
|
{% if project.owner %}
|
||||||
<div class="block">
|
<div class="block">
|
||||||
{% if project.owner.email %}
|
{% if project.owner.email %}
|
||||||
The project owner is <a href="mailto:{{ project.owner.email }}">{{ project.owner }}</a>
|
The project owner is <strong><a href="mailto:{{ project.owner.email }}">{{ project.owner }}</a></strong>.
|
||||||
{% else %}
|
{% else %}
|
||||||
The project owner is {{ project.owner }}.
|
The project owner is <strong>{{ project.owner }}</strong>.
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
{% if request.is_admin %}
|
||||||
|
<div class="box">
|
||||||
{% if 'library' in modules %}
|
|
||||||
<div class="column is-one-third">
|
|
||||||
{% include 'library/project_detail.html' %}
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% if 'submission' in modules %}
|
|
||||||
<div class="column">
|
|
||||||
{% include 'submissions/project_detail.html' %}
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% if request.is_admin %}
|
|
||||||
<div class="box">
|
|
||||||
<h3 class="subtitle">Admin Actions</h3>
|
<h3 class="subtitle">Admin Actions</h3>
|
||||||
<ul>
|
<ul>
|
||||||
<li><a href="{{ project_link }}">Project Link</a></li>
|
<li><a href="{{ project_link }}">Project Link</a></li>
|
||||||
{% if 'library' in modules %}
|
|
||||||
<li><a href="{% url 'item_list_manage' project=project.pk %}">Manage items</a></li>
|
|
||||||
{% endif %}
|
|
||||||
</ul>
|
</ul>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="column is-one-third">
|
||||||
|
{% if 'polyphonic.library' in modules %}
|
||||||
|
{% include 'library/project_detail.html' %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if 'polyphonic.submission' in modules %}
|
||||||
|
{% include 'submissions/project_detail.html' %}
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
<div>
|
<div>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user