X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/166fc13012c33563b179a2bea5e33d36b0be979c..c931affe5b2e863ad2752a51f8b27d45d5dbb98b:/apps/wiki/views.py diff --git a/apps/wiki/views.py b/apps/wiki/views.py index b78959fb..b57347c2 100644 --- a/apps/wiki/views.py +++ b/apps/wiki/views.py @@ -84,6 +84,7 @@ def editor(request, name, template_name='wiki/document_details.html'): "text_save": DocumentTextSaveForm(prefix="textsave"), "add_tag": DocumentTagForm(prefix="addtag"), }, + 'REDMINE_URL': settings.REDMINE_URL, }) @@ -113,6 +114,7 @@ def editor_readonly(request, name, template_name='wiki/document_details_readonly 'document_name': document.name, 'document_info': dict(document.info(), readonly=True), 'document_meta': document.meta, + 'REDMINE_URL': settings.REDMINE_URL, }) @@ -155,7 +157,13 @@ def text(request, name): comment = form.cleaned_data['comment'] if form.cleaned_data['stage_completed']: comment += '\n#stage-finished: %s\n' % form.cleaned_data['stage_completed'] - author = "%s <%s>" % (form.cleaned_data['author_name'], form.cleaned_data['author_email']) + if request.user.is_authenticated(): + author_name = request.user + author_email = request.user.email + else: + author_name = form.cleaned_data['author_name'] + author_email = form.cleaned_data['author_email'] + author = "%s <%s>" % (author_name, author_email) storage.put(document, author=author, comment=comment, parent=revision) document = storage.get(name) return JSONResponse({