fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hard linking of texts to catalogue.
[redakcja.git]
/
src
/
sources
/
views.py
diff --git
a/src/sources/views.py
b/src/sources/views.py
index
a5664f7
..
663ebac
100644
(file)
--- a/
src/sources/views.py
+++ b/
src/sources/views.py
@@
-3,6
+3,7
@@
from django.shortcuts import render, get_object_or_404, redirect
from django.utils.translation import gettext as _
from django.views.generic import DetailView
from fileupload.views import UploadView
from django.utils.translation import gettext as _
from django.views.generic import DetailView
from fileupload.views import UploadView
+import catalogue.models
from . import models
from . import models
@@
-12,6
+13,8
@@
class SourceView(DetailView):
class SourceUploadView(UploadView):
class SourceUploadView(UploadView):
+ template_name = 'sources/upload.html'
+
def get_object(self, request, sid):
source = get_object_or_404(models.Source, id=sid)
return source
def get_object(self, request, sid):
source = get_object_or_404(models.Source, id=sid)
return source
@@
-37,17
+40,11
@@
class SourceUploadView(UploadView):
return response
return response
-def prepare(request,
bsid
):
- b
s = get_object_or_404(models.BookSource, id=bsid
)
+def prepare(request,
pk
):
+ b
ook = get_object_or_404(catalogue.models.Book, id=pk
)
if request.POST:
if request.POST:
- dbook =
bs.prepare_document(
request.user)
+ dbook =
models.BookSource.prepare_document(book,
request.user)
return redirect('wiki_editor', dbook.slug, dbook[0].slug)
else:
return redirect('wiki_editor', dbook.slug, dbook[0].slug)
else:
- return render(
- request,
- 'sources/prepare.html',
- {
- 'book_source': bs,
- }
- )
+ return redirect(book.get_absolute_url())