X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/ab2c0be6275e50a83cd07fff92a08e01a663abae..1bcd1751f42603c844f1b461d418e502159a5ef5:/apps/explorer/views.py?ds=sidebyside diff --git a/apps/explorer/views.py b/apps/explorer/views.py index dbf5f3a1..eff1b044 100644 --- a/apps/explorer/views.py +++ b/apps/explorer/views.py @@ -1,30 +1,20 @@ -from librarian import html -import hg, urllib2, time -from django.utils import simplejson as json +# -*- coding: utf-8 -*- +import urllib2 -from django.views.generic.simple import direct_to_template +import logging +log = logging.getLogger('platforma.explorer.views') from django.conf import settings -from django.http import HttpResponseRedirect, HttpResponse +from django.contrib.auth.decorators import login_required, permission_required from django.core.urlresolvers import reverse -from django.core.paginator import Paginator, InvalidPage, EmptyPage - +from django.http import HttpResponse +from django.utils import simplejson as json +from django.views.generic.simple import direct_to_template from django.contrib.auth.decorators import login_required -from explorer import forms, models - -# -# Some useful decorators -# -def with_repo(view): - """Open a repository for this view""" - def view_with_repo(request, *args, **kwargs): - kwargs['repo'] = hg.Repository(settings.REPOSITORY_PATH) - return view(request, *args, **kwargs) - return view_with_repo +from api.models import PullRequest -# def ajax_login_required(view): """Similar ro @login_required, but instead of redirect, just return some JSON stuff with error.""" @@ -32,177 +22,98 @@ def ajax_login_required(view): if request.user.is_authenticated(): return view(request, *args, **kwargs) # not authenticated - return HttpResponse( json.dumps({'result': 'access_denied'}) ); + return HttpResponse( json.dumps({'result': 'access_denied', 'errors': ['Brak dostępu.']}) ); return view_with_auth +@login_required +def display_editor(request, path): + user = request.GET.get('user', request.user.username) + log.info(user) + + return direct_to_template(request, 'explorer/editor.html', extra_context={ + 'fileid': path, + 'euser': user + }) + # # View all files # -@with_repo -def file_list(request, repo): - paginator = Paginator( repo.file_list(), 100); - bookform = forms.BookUploadForm() +def file_list(request): + import api.forms + from api.resources import library_resource - try: - page = int(request.GET.get('page', '1')) - except ValueError: - page = 1 - - try: - files = paginator.page(page) - except (EmptyPage, InvalidPage): - files = paginator.page(paginator.num_pages) + bookform = api.forms.DocumentUploadForm() + # short-circut the api document list + doctree = library_resource.handler.read(request) + # print "DOCTREE:", doctree['documents'] + return direct_to_template(request, 'explorer/file_list.html', extra_context={ - 'files': files, 'page': page, 'bookform': bookform, + 'filetree': doctree['documents'], 'bookform': bookform, }) -@login_required -@with_repo +@permission_required('api.document.can_add') def file_upload(request, repo): - form = forms.BookUploadForm(request.POST, request.FILES) - if form.is_valid(): - f = request.FILES['file'] - print 'Adding file: %s' % f.name - repo.add_file(f.name, f.read().decode('utf-8')) - return HttpResponseRedirect( reverse('editor_view', kwargs={'path': f.name}) ) - - return direct_to_template(request, 'explorer/file_upload.html', - extra_context = {'form' : form} ) - -# -# Edit the file -# - -@ajax_login_required -@with_repo -def file_xml(request, repo, path): - if request.method == 'POST': - form = forms.BookForm(request.POST) - if form.is_valid(): - print 'Saving whole text.', request.user.username - def save_action(): - print 'In branch: ' + repo.repo[None].branch() - repo._add_file(path, form.cleaned_data['content']) - repo._commit(message=(form.cleaned_data['commit_message'] or 'Lokalny zapis platformy.'), user=request.user.username) - - print repo.in_branch(save_action, models.user_branch(request.user) ); - result = "ok" - else: - result = "error" - - errors = dict( (field[0], field[1].as_text()) for field in form.errors.iteritems() ) - return HttpResponse( json.dumps({'result': result, 'errors': errors}) ); - - form = forms.BookForm() - data = repo.get_file(path, models.user_branch(request.user)) - form.fields['content'].initial = data - return HttpResponse( json.dumps({'result': 'ok', 'content': data}) ) - -@ajax_login_required -@with_repo -def file_dc(request, path, repo): - if request.method == 'POST': - form = forms.DublinCoreForm(request.POST) - if form.is_valid(): - form.save(repo, path) - result = "ok" + from api.resources import library_resource + from api.forms import DocumentUploadForm + from django.http import HttpRequest, HttpResponseRedirect + + response = library_resource.handler.create(request) + + if isinstance(response, HttpResponse): + data = json.loads(response.content) + + if response.status_code == 201: + return HttpResponseRedirect( \ + reverse("editor_view", args=[ data['name'] ]) ) else: - result = "error" - - errors = dict( (field[0], field[1].as_text()) for field in form.errors.iteritems() ) - return HttpResponse( json.dumps({'result': result, 'errors': errors}) ); - - fulltext = repo.get_file(path, models.user_branch(request.user)) - form = forms.DublinCoreForm(text=fulltext) - return HttpResponse( json.dumps({'result': 'ok', 'content': fulltext}) ) - -# Display the main editor view + bookform = DocumentUploadForm(request.POST, request.FILES) + bookform.is_valid() + + return direct_to_template(request, 'explorer/file_upload.html', + extra_context={'bookform': bookform } ) + @login_required -def display_editor(request, path): - return direct_to_template(request, 'explorer/editor.html', extra_context={ - 'hash': path, 'panel_list': ['lewy', 'prawy'], - }) - -# =============== -# = Panel views = -# =============== +def print_html(request, **kwargs): + from api.resources import document_html_resource -@ajax_login_required -@with_repo -def xmleditor_panel(request, path, repo): - form = forms.BookForm() - text = repo.get_file(path, models.user_branch(request.user)) + kwargs['stylesheet'] = 'legacy' - return direct_to_template(request, 'explorer/panels/xmleditor.html', extra_context={ - 'fpath': path, - 'text': text, - }) - - -@ajax_login_required -def gallery_panel(request, path): - return direct_to_template(request, 'explorer/panels/gallery.html', extra_context={ - 'fpath': path, - 'form': forms.ImageFoldersForm(), - }) - -@ajax_login_required -@with_repo -def htmleditor_panel(request, path, repo): - user_branch = models.user_branch(request.user) - return direct_to_template(request, 'explorer/panels/htmleditor.html', extra_context={ - 'fpath': path, - 'html': html.transform(repo.get_file(path, user_branch), is_file=False), - }) - - -@ajax_login_required -@with_repo -def dceditor_panel(request, path, repo): - user_branch = models.user_branch(request.user) - text = repo.get_file(path, user_branch) - form = forms.DublinCoreForm(text=text) - - return direct_to_template(request, 'explorer/panels/dceditor.html', extra_context={ - 'fpath': path, - 'form': form, - }) - + output = document_html_resource.handler.read(request, **kwargs) -# ================= -# = Utility views = -# ================= -@ajax_login_required -def folder_images(request, folder): - return direct_to_template(request, 'explorer/folder_images.html', extra_context={ - 'images': models.get_images_from_folder(folder), - }) + if isinstance(output, HttpResponse): + # errors = json.loads(output.content) + output.mimetype = "text/plain" + return output + + return direct_to_template(request, 'html4print.html', + extra_context={'output': output, 'docid': kwargs['docid']}, + mimetype="text/html" ) def _add_references(message, issues): return message + " - " + ", ".join(map(lambda issue: "Refs #%d" % issue['id'], issues)) -def _get_issues_for_file(path): - if not path.endswith('.xml'): - raise ValueError('Path must end with .xml') - - book_id = path[:-4] +def _get_issues_for_file(fileid): uf = None - try: - uf = urllib2.urlopen(settings.REDMINE_URL + 'publications/issues/%s.json' % book_id) + uf = urllib2.urlopen(settings.REDMINE_URL + 'publications/issues/%s.json' % fileid) return json.loads(uf.read()) except urllib2.HTTPError: return [] finally: if uf: uf.close() - # ================= # = Pull requests = # ================= -def pull_requests(request): - return direct_to_template(request, 'manager/pull_request.html', extra_context = { - 'objects': models.PullRequest.objects.all()} ) +def pull_requests(request): + objects = PullRequest.objects.order_by('status') + + if not request.user.has_perm('explorer.book.can_share'): + objects = objects.filter(comitter=request.user) + + + return direct_to_template(request, 'manager/pull_request.html', + extra_context = {'objects': objects} )