X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/38343a3fc11f5509c8522fec94c0ae7085b7244f..a39ce20a7f4d01f30508c4d003e6d973298866c6:/apps/explorer/views.py diff --git a/apps/explorer/views.py b/apps/explorer/views.py index b1513e0c..4a78e019 100644 --- a/apps/explorer/views.py +++ b/apps/explorer/views.py @@ -5,7 +5,7 @@ from django.views.generic.simple import direct_to_template from django.conf import settings from django.http import HttpResponseRedirect -from explorer import forms +from explorer import forms, models repo = hg.Repository(settings.REPOSITORY_PATH) @@ -22,8 +22,8 @@ def file_xml(request, path): form = forms.BookForm(request.POST) if form.is_valid(): repo.add_file(path, form.cleaned_data['text']) - repo.commit() - return HttpResponseRedirect('/') + repo.commit(message=form.cleaned_data['commit_message'], user=form.cleaned_data['user']) + return HttpResponseRedirect(request.get_full_path()) else: form = forms.BookForm() form.fields['text'].initial = repo.get_file(path).data() @@ -31,6 +31,7 @@ def file_xml(request, path): return direct_to_template(request, 'explorer/file_xml.html', extra_context={ 'hash': path, 'form': form, + 'image_folders_form': forms.ImageFoldersForm(), }) @@ -38,5 +39,12 @@ def file_html(request, path): return direct_to_template(request, 'explorer/file_html.html', extra_context={ 'object': html.transform(repo.get_file(path).data(), is_file=False), 'hash': path, + 'image_folders_form': forms.ImageFoldersForm(), }) - \ No newline at end of file + + +def folder_images(request, folder): + return direct_to_template(request, 'explorer/folder_images.html', extra_context={ + 'images': models.get_images_from_folder(folder), + }) +