From a959320586b7ff20888129977d92ae8de414e5d7 Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Wed, 30 Nov 2016 14:12:10 +0100 Subject: [PATCH 1/1] more about categories --- apps/catalogue/forms.py | 95 +++++++++---------- .../migrations/0008_category_dc_tag.py | 20 ++++ .../migrations/0009_auto_20161130_1346.py | 22 +++++ apps/catalogue/models/tag.py | 7 ++ apps/organizations/models.py | 7 +- 5 files changed, 96 insertions(+), 55 deletions(-) create mode 100644 apps/catalogue/migrations/0008_category_dc_tag.py create mode 100644 apps/catalogue/migrations/0009_auto_20161130_1346.py diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py index 4b1214f4..3f32734d 100644 --- a/apps/catalogue/forms.py +++ b/apps/catalogue/forms.py @@ -3,21 +3,27 @@ # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # +from catalogue.models import Category from catalogue.models import User -from django.db.models import Count from django import forms from django.utils.translation import ugettext_lazy as _ from catalogue.constants import MASTERS -from catalogue.models import Document, Template +from catalogue.models import Document + + +def tag_field(category_tag, required=True): + category = Category.objects.get(dc_tag=category_tag) + return forms.ModelMultipleChoiceField(queryset=category.tag_set.all(), required=required) + class DocumentCreateForm(forms.Form): """ Form used for creating new documents. """ owner_organization = forms.CharField(required=False) - title = forms.CharField(required=True) - language = forms.CharField(required=True) + title = forms.CharField() + language = forms.CharField() publisher = forms.CharField(required=False) description = forms.CharField(required=False) rights = forms.CharField(required=False) @@ -25,31 +31,31 @@ class DocumentCreateForm(forms.Form): cover = forms.FileField(required=False) - #summary = forms.CharField(required=True) - #template = forms.ModelChoiceField(Template.objects, required=False) - - #class Meta: - #model = Book - #exclude = ['parent', 'parent_number', 'project', 'gallery', 'public'] - - #def __init__(self, *args, org=None, **kwargs): - # super(DocumentCreateForm, self).__init__(*args, **kwargs) - #self.fields['slug'].widget.attrs={'class': 'autoslug'} - #self.fields['title'].widget.attrs={'class': 'autoslug-source'} - #self.fields['template'].queryset = Template.objects.filter(is_main=True) - - #~ def clean(self): - #~ super(DocumentCreateForm, self).clean() - #template = self.cleaned_data['template'] - #self.cleaned_data['gallery'] = self.cleaned_data['slug'] - - #~ if template is not None: - #~ self.cleaned_data['text'] = template.content - - #~ if not self.cleaned_data.get("text"): - #~ self._errors["template"] = self.error_class([_("You must select a template")]) - - #~ return self.cleaned_data + # summary = forms.CharField(required=True) + # template = forms.ModelChoiceField(Template.objects, required=False) + # + # class Meta: + # model = Book + # exclude = ['parent', 'parent_number', 'project', 'gallery', 'public'] + # + # def __init__(self, *args, org=None, **kwargs): + # super(DocumentCreateForm, self).__init__(*args, **kwargs) + # self.fields['slug'].widget.attrs={'class': 'autoslug'} + # self.fields['title'].widget.attrs={'class': 'autoslug-source'} + # self.fields['template'].queryset = Template.objects.filter(is_main=True) + # + # def clean(self): + # super(DocumentCreateForm, self).clean() + # template = self.cleaned_data['template'] + # self.cleaned_data['gallery'] = self.cleaned_data['slug'] + # + # if template is not None: + # self.cleaned_data['text'] = template.content + # + # if not self.cleaned_data.get("text"): + # self._errors["template"] = self.error_class([_("You must select a template")]) + # + # return self.cleaned_data class DocumentsUploadForm(forms.Form): @@ -57,8 +63,9 @@ class DocumentsUploadForm(forms.Form): Form used for uploading new documents. """ file = forms.FileField(required=True, label=_('ZIP file')) - dirs = forms.BooleanField(label=_('Directories are documents in chunks'), - widget = forms.CheckboxInput(attrs={'disabled':'disabled'})) + dirs = forms.BooleanField( + label=_('Directories are documents in chunks'), + widget=forms.CheckboxInput(attrs={'disabled': 'disabled'})) def clean(self): file = self.cleaned_data['file'] @@ -78,29 +85,15 @@ class DocumentForm(forms.ModelForm): """ Form used for editing a chunk. """ - user = forms.ModelChoiceField(queryset= - User.objects.order_by('last_name', 'first_name'), required=False, - label=_('Assigned to')) + user = forms.ModelChoiceField( + queryset=User.objects.order_by('last_name', 'first_name'), + required=False, label=_('Assigned to')) class Meta: model = Document fields = ['user', 'stage'] -class DocumentAddForm(DocumentForm): - """ - Form used for adding a chunk to a document. - """ - - def clean_slug(self): - slug = self.cleaned_data['slug'] - try: - user = Chunk.objects.get(book=self.instance.book, slug=slug) - except Chunk.DoesNotExist: - return slug - raise forms.ValidationError(_('Chunk with this slug already exists')) - - class BookForm(forms.ModelForm): """Form used for editing a Book.""" @@ -109,20 +102,18 @@ class BookForm(forms.ModelForm): exclude = ['project'] def __init__(self, *args, **kwargs): - ret = super(BookForm, self).__init__(*args, **kwargs) + super(BookForm, self).__init__(*args, **kwargs) self.fields['slug'].widget.attrs.update({"class": "autoslug"}) self.fields['title'].widget.attrs.update({"class": "autoslug-source"}) - return ret class ReadonlyBookForm(BookForm): """Form used for not editing a Book.""" def __init__(self, *args, **kwargs): - ret = super(ReadonlyBookForm, self).__init__(*args, **kwargs) + super(ReadonlyBookForm, self).__init__(*args, **kwargs) for field in self.fields.values(): field.widget.attrs.update({"readonly": True}) - return ret class ChooseMasterForm(forms.Form): diff --git a/apps/catalogue/migrations/0008_category_dc_tag.py b/apps/catalogue/migrations/0008_category_dc_tag.py new file mode 100644 index 00000000..77e20560 --- /dev/null +++ b/apps/catalogue/migrations/0008_category_dc_tag.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('catalogue', '0007_document_tags'), + ] + + operations = [ + migrations.AddField( + model_name='category', + name='dc_tag', + field=models.CharField(default='', max_length=32), + preserve_default=False, + ), + ] diff --git a/apps/catalogue/migrations/0009_auto_20161130_1346.py b/apps/catalogue/migrations/0009_auto_20161130_1346.py new file mode 100644 index 00000000..54d2a29c --- /dev/null +++ b/apps/catalogue/migrations/0009_auto_20161130_1346.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('catalogue', '0008_category_dc_tag'), + ] + + operations = [ + migrations.AlterModelOptions( + name='category', + options={'ordering': ['index']}, + ), + migrations.AlterModelOptions( + name='tag', + options={'ordering': ['index']}, + ), + ] diff --git a/apps/catalogue/models/tag.py b/apps/catalogue/models/tag.py index b58f4581..e5390972 100644 --- a/apps/catalogue/models/tag.py +++ b/apps/catalogue/models/tag.py @@ -11,10 +11,17 @@ from django.utils.translation import ugettext_lazy as _ class Category(models.Model): label = models.CharField(max_length=64, verbose_name=_('category')) + dc_tag = models.CharField(max_length=32) index = models.IntegerField() + class Meta: + ordering = ['index'] + class Tag(models.Model): label = models.CharField(max_length=64, verbose_name=_('tag')) category = models.ForeignKey(Category) index = models.IntegerField() + + class Meta: + ordering = ['index'] diff --git a/apps/organizations/models.py b/apps/organizations/models.py index 9d3300a2..0761b669 100644 --- a/apps/organizations/models.py +++ b/apps/organizations/models.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- from __future__ import unicode_literals from django.core.urlresolvers import reverse @@ -5,8 +6,7 @@ from django.contrib.auth.models import User from django.db import models from django.utils.encoding import python_2_unicode_compatible from django.template.loader import render_to_string -from django.utils import translation -#from jsonfield import JSONField +from django.utils import translation countries = [ @@ -83,9 +83,10 @@ class Card(models.Model): p = getattr(self, "preview_html_%s" % lang) assert p return p - except: + except AssertionError: return self.preview_html + @python_2_unicode_compatible class UserCard(Card): preview_html_template = 'organizations/snippets/user.html' -- 2.20.1