X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/333700b34cb944ab49d1c9243f7193d50d25ebd1..93aef898ef3f9554c6ee7624113b4e7e0c62abc4:/apps/explorer/views.py?ds=sidebyside diff --git a/apps/explorer/views.py b/apps/explorer/views.py old mode 100644 new mode 100755 index 7a42b432..c1ada7a5 --- a/apps/explorer/views.py +++ b/apps/explorer/views.py @@ -1,48 +1,25 @@ # -*- coding: utf-8 -*- import urllib2 -import hg, re -from datetime import date -import librarian - -from librarian import html, parser, dcparser -from librarian import ParseError, ValidationError +import logging +log = logging.getLogger('platforma.explorer.views') from django.conf import settings from django.contrib.auth.decorators import login_required, permission_required from django.core.urlresolvers import reverse -from django.http import HttpResponseRedirect, HttpResponse, HttpResponseNotFound +from django.http import HttpResponse, Http404 from django.utils import simplejson as json from django.views.generic.simple import direct_to_template +from django.shortcuts import render_to_response +from django.template import RequestContext from django.contrib.auth.decorators import login_required from explorer import forms, models -from toolbar import models as toolbar_models - -from django.forms.util import ErrorList - -import wlrepo - -# -# Some useful decorators - -def file_branch(fileid, user=None): - parts = fileid.split('$') - return ('personal_'+ user.username + '_' if user is not None else '') \ - + 'file_' + parts[0] +import os +# from api.models import PullRequest +from bookthemes.models import Theme -def file_path(fileid): - return 'pub_'+fileid+'.xml' - -def with_repo(view): - """Open a repository for this view""" - def view_with_repo(request, *args, **kwargs): - kwargs['repo'] = wlrepo.open_library(settings.REPOSITORY_PATH, 'hg') - return view(request, *args, **kwargs) - return view_with_repo - -# def ajax_login_required(view): """Similar ro @login_required, but instead of redirect, just return some JSON stuff with error.""" @@ -54,45 +31,37 @@ def ajax_login_required(view): return view_with_auth @login_required -# @with_repo def display_editor(request, path): - # this is the only entry point where we create an autobranch for the user - # if it doesn't exists. All other views SHOULD fail. - #def ensure_branch_exists(): - # parent = repo.get_branch_tip('default') - # repo._create_branch(file_branch(path, request.user), parent) - -# try: - # repo.with_wlock(ensure_branch_exists) - - return direct_to_template(request, 'explorer/editor.html', extra_context={ - 'fileid': path, - 'panel_list': ['lewy', 'prawy'], - 'availble_panels': models.EditorPanel.objects.all(), - # 'scriptlets': toolbar_models.Scriptlet.objects.all() - }) + user = request.GET.get('user', request.user.username) + gallery_form = forms.GalleryChoiceForm() + return render_to_response('explorer/editor.html', + # mimetype="text/html", + dictionary = { + 'fileid': path, + 'euser': user, + 'gallery_form': gallery_form, + 'available_themes': ({'first_letter': t.name[0].upper(), 'name': t.name} for t in Theme.objects.order_by('name')), + }, context_instance=RequestContext(request)) + # # View all files # -@with_repo -def file_list(request, repo): - import api.forms - from api.resources import library_resource - - bookform = api.forms.DocumentUploadForm() +def file_list(request): + from wiki.views import document_list # short-circut the api document list - doctree = library_resource.handler.read(request) + # doctree = library_resource.handler.read(request) # print "DOCTREE:", doctree['documents'] - return direct_to_template(request, 'explorer/file_list.html', extra_context={ - 'filetree': doctree['documents'], 'bookform': bookform, - }) + return document_list(request, 'explorer/file_list.html') + + # return direct_to_template(request, 'explorer/file_list.html', extra_context={ + # 'files': files, 'bookform': bookform, + # }) -@permission_required('explorer.can_add_files') -@with_repo -def file_upload(request, repo): +@permission_required('api.document.can_add') +def file_upload(request): from api.resources import library_resource from api.forms import DocumentUploadForm from django.http import HttpRequest, HttpResponseRedirect @@ -116,6 +85,8 @@ def file_upload(request, repo): @login_required def print_html(request, **kwargs): from api.resources import document_html_resource + + kwargs['stylesheet'] = 'legacy' output = document_html_resource.handler.read(request, **kwargs) @@ -145,6 +116,29 @@ def _get_issues_for_file(fileid): # ================= # = 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', 'timestamp') + + 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} ) + + +# +# Testing +# +def renderer_test(request): + return direct_to_template(request, 'renderer.html', mimetype="text/html", + extra_context = {} ) + + +def document_gallery(request, directory): + try: + base_dir = os.path.join(settings.MEDIA_ROOT, settings.FILEBROWSER_DIRECTORY, directory) + print base_dir + images = ['%s%s%s/%s' % (settings.MEDIA_URL, settings.FILEBROWSER_DIRECTORY, directory, f) for f in os.listdir(base_dir) if os.path.splitext(f)[1].lower() in ('.jpg', '.jpeg', '.png')] + return HttpResponse(json.dumps(images)) + except (IndexError, OSError), e: + raise Http404