from django.core.urlresolvers import reverse
from django.db.models import Count, Q
from django import http
-from django.http import Http404
+from django.http import Http404, HttpResponseForbidden
from django.shortcuts import get_object_or_404, render
from django.utils.encoding import iri_to_uri
from django.utils.http import urlquote_plus
from catalogue import helpers
from catalogue.helpers import active_tab
from catalogue.models import Book, Chunk, BookPublishRecord, ChunkPublishRecord
-from catalogue import xml_tools
+from catalogue.tasks import publishable_error
#
# Quick hack around caching problems, TODO: use ETags
return render(request, 'catalogue/my_page.html', {
'last_books': sorted(request.session.get("wiki_last_books", {}).items(),
key=lambda x: x[1]['time'], reverse=True),
+
+ "logout_to": '/',
})
creator=creator,
slug=form.cleaned_data['slug'],
title=form.cleaned_data['title'],
+ gallery=form.cleaned_data['gallery'],
)
- return http.HttpResponseRedirect(reverse("wiki_editor", args=[book.slug]))
+ return http.HttpResponseRedirect(reverse("catalogue_book", args=[book.slug]))
else:
form = forms.DocumentCreateForm(initial={
"slug": slug,
"title": slug.replace('-', ' ').title(),
+ "gallery": slug,
})
return direct_to_template(request, "catalogue/document_create_missing.html", extra_context={
"slug": slug,
"form": form,
+
+ "logout_to": '/',
})
"ok_list": ok_list,
"skipped_list": skipped_list,
"error_list": error_list,
+
+ "logout_to": '/',
})
else:
form = forms.DocumentsUploadForm()
return direct_to_template(request, "catalogue/document_upload.html", extra_context={
"form": form,
+
+ "logout_to": '/',
})
@never_cache
def book_xml(request, slug):
- xml = get_object_or_404(Book, slug=slug).materialize()
+ book = get_object_or_404(Book, slug=slug)
+ if not book.accessible(request):
+ return HttpResponseForbidden("Not authorized.")
+ xml = book.materialize()
response = http.HttpResponse(xml, content_type='application/xml', mimetype='application/wl+xml')
response['Content-Disposition'] = 'attachment; filename=%s.xml' % slug
@never_cache
def book_txt(request, slug):
- xml = get_object_or_404(Book, slug=slug).materialize()
+ book = get_object_or_404(Book, slug=slug)
+ if not book.accessible(request):
+ return HttpResponseForbidden("Not authorized.")
+ xml = book.materialize()
output = StringIO()
# errors?
librarian.text.transform(StringIO(xml), output)
@never_cache
def book_html(request, slug):
- xml = get_object_or_404(Book, slug=slug).materialize()
+ book = get_object_or_404(Book, slug=slug)
+ if not book.accessible(request):
+ return HttpResponseForbidden("Not authorized.")
+ xml = book.materialize()
output = StringIO()
# errors?
librarian.html.transform(StringIO(xml), output, parse_dublincore=False,
response = http.HttpResponse(html, content_type='text/html', mimetype='text/html')
return response
-
@never_cache
def revision(request, slug, chunk=None):
try:
doc = Chunk.get(slug, chunk)
except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist):
raise Http404
+ if not doc.book.accessible(request):
+ return HttpResponseForbidden("Not authorized.")
return http.HttpResponse(str(doc.revision()))
def book(request, slug):
book = get_object_or_404(Book, slug=slug)
-
- # TODO: most of this should go somewhere else
-
- # do we need some automation?
- first_master = None
- chunks = []
- need_fixing = False
- choose_master = False
-
- length = book.chunk_set.count()
- for i, chunk in enumerate(book):
- chunk_dict = {
- "chunk": chunk,
- "fix": [],
- "grade": ""
- }
- graded = xml_tools.GradedText(chunk.materialize())
- if graded.is_wl():
- master = graded.master()
- if first_master is None:
- first_master = master
- elif master != first_master:
- chunk_dict['fix'].append('bad-master')
-
- if i > 0 and not graded.has_trim_begin():
- chunk_dict['fix'].append('trim-begin')
- if i < length - 1 and not graded.has_trim_end():
- chunk_dict['fix'].append('trim-end')
-
- if chunk_dict['fix']:
- chunk_dict['grade'] = 'wl-fix'
- else:
- chunk_dict['grade'] = 'wl'
-
- elif graded.is_broken_wl():
- chunk_dict['grade'] = 'wl-broken'
- elif graded.is_xml():
- chunk_dict['grade'] = 'xml'
+ if not book.accessible(request):
+ return HttpResponseForbidden("Not authorized.")
+
+ if request.user.has_perm('catalogue.change_book'):
+ if request.method == "POST":
+ form = forms.BookForm(request.POST, instance=book)
+ if form.is_valid():
+ form.save()
+ return http.HttpResponseRedirect(book.get_absolute_url())
else:
- chunk_dict['grade'] = 'plain'
- chunk_dict['fix'].append('wl')
- choose_master = True
-
- if chunk_dict['fix']:
- need_fixing = True
- chunks.append(chunk_dict)
-
- if first_master or not need_fixing:
- choose_master = False
-
- if request.method == "POST":
- form = forms.ChooseMasterForm(request.POST)
- if not choose_master or form.is_valid():
- if choose_master:
- first_master = form.cleaned_data['master']
-
- # do the actual fixing
- for c in chunks:
- if not c['fix']:
- continue
-
- text = c['chunk'].materialize()
- for fix in c['fix']:
- if fix == 'bad-master':
- text = xml_tools.change_master(text, first_master)
- elif fix == 'trim-begin':
- text = xml_tools.add_trim_begin(text)
- elif fix == 'trim-end':
- text = xml_tools.add_trim_end(text)
- elif fix == 'wl':
- text = xml_tools.basic_structure(text, first_master)
- author = request.user if request.user.is_authenticated() else None
- description = "auto-fix: " + ", ".join(c['fix'])
- c['chunk'].commit(text=text, author=author,
- description=description)
-
- return http.HttpResponseRedirect(book.get_absolute_url())
- elif choose_master:
- form = forms.ChooseMasterForm()
+ form = forms.BookForm(instance=book)
+ editable = True
else:
- form = None
+ form = forms.ReadonlyBookForm(instance=book)
+ editable = False
- try:
- book.assert_publishable()
- except AssertionError, e:
- publishable = False
- publishable_error = e
- else:
- publishable = True
- publishable_error = None
+ publish_error = publishable_error(book)
+ publishable = publish_error is None
return direct_to_template(request, "catalogue/book_detail.html", extra_context={
"book": book,
"publishable": publishable,
- "publishable_error": publishable_error,
- "chunks": chunks,
- "need_fixing": need_fixing,
- "choose_master": choose_master,
- "first_master": first_master,
+ "publishable_error": publish_error,
"form": form,
+ "editable": editable,
})
doc = Chunk.get(slug, chunk)
except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist):
raise Http404
+ if not doc.book.accessible(request):
+ return HttpResponseForbidden("Not authorized.")
if request.method == "POST":
form = forms.ChunkAddForm(request.POST, instance=doc)
doc = Chunk.get(slug, chunk)
except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist):
raise Http404
+ if not doc.book.accessible(request):
+ return HttpResponseForbidden("Not authorized.")
+
if request.method == "POST":
form = forms.ChunkForm(request.POST, instance=doc)
if form.is_valid():
@permission_required('catalogue.change_book')
def book_append(request, slug):
book = get_object_or_404(Book, slug=slug)
+ if not book.accessible(request):
+ return HttpResponseForbidden("Not authorized.")
+
if request.method == "POST":
form = forms.BookAppendForm(book, request.POST)
if form.is_valid():
return direct_to_template(request, "catalogue/book_append_to.html", extra_context={
"book": book,
"form": form,
- })
-
-@permission_required('catalogue.change_book')
-def book_edit(request, slug):
- book = get_object_or_404(Book, slug=slug)
- if request.method == "POST":
- form = forms.BookForm(request.POST, instance=book)
- if form.is_valid():
- form.save()
- return http.HttpResponseRedirect(book.get_absolute_url())
- else:
- form = forms.BookForm(instance=book)
- return direct_to_template(request, "catalogue/book_edit.html", extra_context={
- "book": book,
- "form": form,
+ "logout_to": '/',
})
@login_required
def publish(request, slug):
book = get_object_or_404(Book, slug=slug)
+ if not book.accessible(request):
+ return HttpResponseForbidden("Not authorized.")
+
try:
book.publish(request.user)
except NotAuthorizedError:
fnp / redakcja.git / blobdiff