fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
check and update tags on save in editor
[redakcja.git]
/
apps
/
wiki
/
views.py
diff --git
a/apps/wiki/views.py
b/apps/wiki/views.py
index
6a5f2ac
..
da747cc
100644
(file)
--- a/
apps/wiki/views.py
+++ b/
apps/wiki/views.py
@@
-20,7
+20,7
@@
from django.utils.translation import ugettext as _
from django.views.decorators.http import require_POST
from django.shortcuts import get_object_or_404, render
from django.views.decorators.http import require_POST
from django.shortcuts import get_object_or_404, render
-from catalogue.models import Document, Template
+from catalogue.models import Document, Template
, Category
from dvcs.models import Revision
import nice_diff
from wiki import forms
from dvcs.models import Revision
import nice_diff
from wiki import forms
@@
-82,6
+82,7
@@
def editor(request, pk, template_name='wiki/bootstrap.html'):
"text_revert": forms.DocumentTextRevertForm(prefix="textrevert"),
"text_publish": forms.DocumentTextPublishForm(prefix="textpublish"),
},
"text_revert": forms.DocumentTextRevertForm(prefix="textrevert"),
"text_publish": forms.DocumentTextPublishForm(prefix="textpublish"),
},
+ 'tag_categories': Category.objects.all(),
'pk': doc.pk,
})
'pk': doc.pk,
})
@@
-107,9
+108,6
@@
def text(request, doc_id):
# else:
# parent = None
stage = form.cleaned_data['stage']
# else:
# parent = None
stage = form.cleaned_data['stage']
- # tags = [stage] if stage else []
- # publishable = (form.cleaned_data['publishable'] and
- # request.user.has_perm('catalogue.can_pubmark'))
try:
doc.commit(
author=author,
try:
doc.commit(
author=author,