Skip to content
This repository has been archived by the owner on Nov 7, 2019. It is now read-only.

Commit

Permalink
Merge c750525 into d5a98a2
Browse files Browse the repository at this point in the history
  • Loading branch information
Magdalena Noffke committed Mar 4, 2019
2 parents d5a98a2 + c750525 commit 705245a
Show file tree
Hide file tree
Showing 4 changed files with 266 additions and 297 deletions.
13 changes: 0 additions & 13 deletions liqd_product/apps/projects/dashboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
from django.utils.translation import ugettext_lazy as _

from adhocracy4.dashboard import DashboardComponent
from adhocracy4.dashboard import ProjectFormComponent
from adhocracy4.dashboard import components

from . import forms
from . import views


Expand Down Expand Up @@ -51,16 +49,5 @@ def get_urls(self):
)]


class TopicComponent(ProjectFormComponent):
identifier = 'topics'
weight = 33
label = _('Topics')

form_title = _('Edit topics')
form_class = forms.TopicForm
form_template_name = 'liqd_product_projects/project_topics.html'


components.register_project(ModeratorsComponent())
components.register_project(ParticipantsComponent())
components.register_project(TopicComponent())
10 changes: 0 additions & 10 deletions liqd_product/apps/projects/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
from django.core.exceptions import ValidationError
from django.utils.translation import ugettext_lazy as _

from adhocracy4.dashboard.forms import ProjectDashboardForm
from adhocracy4.projects.models import Project
from liqd_product.apps.users import fields as user_fields

from .models import ModeratorInvite
Expand Down Expand Up @@ -70,11 +68,3 @@ def clean(self):
raise ValidationError(
_('Please enter email addresses or upload a file'))
return cleaned_data


class TopicForm(ProjectDashboardForm):

class Meta:
model = Project
fields = ['topics']
required_for_project_publish = ['topics']

0 comments on commit 705245a

Please sign in to comment.