X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/2f28bc0bc1344ebce95a7f4f416c07cfd4a166cf..391b3e40affcdacc99dae60cc2dd51f30114fd94:/apps/wiki/views.py diff --git a/apps/wiki/views.py b/apps/wiki/views.py index d7763025..20dca02f 100644 --- a/apps/wiki/views.py +++ b/apps/wiki/views.py @@ -52,7 +52,7 @@ def get_history(chunk): @never_cache -@login_required +# @login_required def editor(request, slug, chunk=None, template_name='wiki/bootstrap.html'): try: chunk = Chunk.get(slug, chunk) @@ -82,14 +82,22 @@ def editor(request, slug, chunk=None, template_name='wiki/bootstrap.html'): del last_books[oldest_key] request.session['wiki_last_books'] = last_books - save_form = forms.DocumentTextSaveForm(user=request.user, prefix="textsave") + save_form = forms.DocumentTextSaveForm(user=request.user, chunk=chunk, prefix="textsave") + try: + version = int(request.GET.get('version', None)) + except: + version = None + if version: + text = chunk.at_revision(version).materialize() + else: + text = chunk.materialize() return render(request, template_name, { 'serialized_document_data': simplejson.dumps({ - 'document': chunk.materialize(), + 'document': text, 'document_id': chunk.id, 'title': chunk.book.title, 'history': get_history(chunk), - 'version': chunk.revision(), + 'version': version or chunk.revision(), 'stage': chunk.stage.name if chunk.stage else None, 'assignment': chunk.user.username if chunk.user else None }), @@ -144,7 +152,7 @@ def text(request, chunk_id): return HttpResponseForbidden("Not authorized.") if request.method == 'POST': - form = forms.DocumentTextSaveForm(request.POST, user=request.user, prefix="textsave") + form = forms.DocumentTextSaveForm(request.POST, user=request.user, chunk=doc, prefix="textsave") if form.is_valid(): if request.user.is_authenticated(): author = request.user @@ -169,6 +177,8 @@ def text(request, chunk_id): author_email=form.cleaned_data['author_email'], publishable=publishable, ) + doc.book.for_cybernauts = form.cleaned_data['for_cybernauts'] + doc.book.save() revision = doc.revision() return JSONResponse({ 'text': doc.materialize() if parent_revision != revision else None,