"mouse" cursor

[redakcja.git] / apps / catalogue / views.py

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 658b3d4..a11eadb 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -23,7 +23,9 @@ from django.utils.http import urlquote_plus
 from django.views.decorators.http import require_POST
 
 from catalogue import forms
 from django.views.decorators.http import require_POST
 
 from catalogue import forms

+from catalogue.forms import TagMultipleForm, TagSingleForm

 from catalogue.helpers import active_tab
 from catalogue.helpers import active_tab

+from catalogue.models import Category

 from librarian import BuildError
 from redakcja.utlis import send_notify_email
 from .constants import STAGES
 from librarian import BuildError
 from redakcja.utlis import send_notify_email
 from .constants import STAGES


@@ -41,12 +43,6 @@ from django.views.decorators.cache import never_cache
 logger = logging.getLogger("fnp.catalogue")
 
 
 logger = logging.getLogger("fnp.catalogue")
 
 

-@active_tab('all')
-@never_cache
-def document_list(request):
-    return render(request, 'catalogue/document_list.html')
-
-

 @never_cache
 def user(request, username):
     user = get_object_or_404(User, username=username)
 @never_cache
 def user(request, username):
     user = get_object_or_404(User, username=username)


@@ -76,7 +72,11 @@ def logout_then_redirect(request):
 def create_missing(request):
     if request.method == "POST":
         form = forms.DocumentCreateForm(request.POST, request.FILES)
 def create_missing(request):
     if request.method == "POST":
         form = forms.DocumentCreateForm(request.POST, request.FILES)

-        if form.is_valid():
+        # tag_forms = [
+        #     (TagMultipleForm if category.multiple else TagSingleForm)(
+        #         category=category, data=request.POST, prefix=category.dc_tag)
+        #     for category in Category.objects.all()]
+        if form.is_valid():  # and all(tag_form.is_valid() for tag_form in tag_forms):

             
             if request.user.is_authenticated():
                 creator = request.user
             
             if request.user.is_authenticated():
                 creator = request.user


@@ -143,8 +143,13 @@ def create_missing(request):
 
         form = forms.DocumentCreateForm(initial={'owner_organization': org})
 
 
         form = forms.DocumentCreateForm(initial={'owner_organization': org})
 

+        # tag_forms = [
+        #     (TagMultipleForm if category.multiple else TagSingleForm)(category=category, prefix=category.dc_tag)
+        #     for category in Category.objects.all()]
+

     return render(request, "catalogue/document_create_missing.html", {
         "form": form,
     return render(request, "catalogue/document_create_missing.html", {
         "form": form,

+        # "tag_forms": tag_forms,

 
         "logout_to": '/',
     })
 
         "logout_to": '/',
     })


@@ -316,7 +321,7 @@ def book_schedule(request, pk):
     book = get_object_or_404(Document, pk=pk, deleted=False)
     if request.method == 'POST':
         Plan.objects.filter(document=book).delete()
     book = get_object_or_404(Document, pk=pk, deleted=False)
     if request.method == 'POST':
         Plan.objects.filter(document=book).delete()

-        for i, s in enumerate(STAGES):
+        for i, (s, name) in enumerate(STAGES):

             user_id = request.POST.get('s%d-user' % i)
             deadline = request.POST.get('s%d-deadline' % i) or None
             Plan.objects.create(document=book, stage=s, user_id=user_id, deadline=deadline)
             user_id = request.POST.get('s%d-user' % i)
             deadline = request.POST.get('s%d-deadline' % i) or None
             Plan.objects.create(document=book, stage=s, user_id=user_id, deadline=deadline)


@@ -328,7 +333,7 @@ def book_schedule(request, pk):
     for p in Plan.objects.filter(document=book):
         current[p.stage] = (getattr(p.user, 'pk', None), (p.deadline.isoformat() if p.deadline else None))
 
     for p in Plan.objects.filter(document=book):
         current[p.stage] = (getattr(p.user, 'pk', None), (p.deadline.isoformat() if p.deadline else None))
 

-    schedule = [(i, s, current.get(s, ())) for (i, s) in enumerate(STAGES)]
+    schedule = [(i, s, current.get(s, ())) for i, (s, name) in enumerate(STAGES)]

     
     if book.owner_organization:
         people = [m.user for m in book.owner_organization.membership_set.exclude(status='pending')]
     
     if book.owner_organization:
         people = [m.user for m in book.owner_organization.membership_set.exclude(status='pending')]