Poprawienie URLi w manager/pull_request.html.

[redakcja.git] / apps / explorer / views.py

diff --git a/apps/explorer/views.py b/apps/explorer/views.py
index 8d80d02..b17b8c8 100644 (file)
--- a/apps/explorer/views.py
+++ b/apps/explorer/views.py
@@ -1,70 +1,119 @@
-from librarian import html
-import hg, urllib2
-from django.utils import simplejson as json
+# -*- coding: utf-8 -*-
+import urllib2
+
+import logging
+log = logging.getLogger('platforma.explorer.views')

 
 

-from django.views.generic.simple import direct_to_template

 from django.conf import settings
 from django.conf import settings

-from django.http import HttpResponseRedirect
+from django.contrib.auth.decorators import login_required, permission_required

 
 

-from explorer import forms, models
+from django.core.urlresolvers import reverse
+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 api.models import PullRequest

 
 

-repo = hg.Repository(settings.REPOSITORY_PATH)
+def ajax_login_required(view):
+    """Similar ro @login_required, but instead of redirect, 
+    just return some JSON stuff with error."""
+    def view_with_auth(request, *args, **kwargs):
+        if request.user.is_authenticated():
+            return view(request, *args, **kwargs)
+        # not authenticated
+        return HttpResponse( json.dumps({'result': 'access_denied', 'errors': ['Brak dostępu.']}) );
+    return view_with_auth

 
 

-def file_list(request):
+@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
+#
+def file_list(request):   
+    import api.forms
+    from api.resources import library_resource
+
+    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={
     return direct_to_template(request, 'explorer/file_list.html', extra_context={

-        'objects': repo.all_files(),
+        'filetree': doctree['documents'], 'bookform': bookform,

     })
 
     })
 

-def file_xml(request, path):
-    if request.method == 'POST':
-        form = forms.BookForm(request.POST)
-        if form.is_valid():
-            repo.add_file(path, form.cleaned_data['text'])
+@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
+
+    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:
+            bookform = DocumentUploadForm(request.POST, request.FILES)
+            bookform.is_valid()

             
             

-            # add references to comment
-            issues = _get_issues_for_file(path)
-            commit_message = _add_references(form.cleaned_data['commit_message'], issues)
-            print 'Commiting with: ' + commit_message
-
-            repo.commit(message=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()
+            return direct_to_template(request, 'explorer/file_upload.html',
+                extra_context={'bookform': bookform } )
+          
+
+@login_required
+def print_html(request, **kwargs):
+    from api.resources import document_html_resource
+
+    kwargs['stylesheet'] = 'legacy'

     
     

-    return direct_to_template(request, 'explorer/file_xml.html', extra_context={
-        'hash': path,
-        'form': form,
-        'image_folders_form': forms.ImageFoldersForm(),
-    })
+    output = document_html_resource.handler.read(request, **kwargs)

 
 

+    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 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(),
-    })
-  
-def folder_images(request, folder):
-    return direct_to_template(request, 'explorer/folder_images.html', extra_context={
-        'images': models.get_images_from_folder(folder),
-    })

 
 def _add_references(message, issues):
     return message + " - " + ", ".join(map(lambda issue: "Refs #%d" % issue['id'], issues))
 
 
 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
     uf = None

-

     try:
     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()
         return json.loads(uf.read())
     except urllib2.HTTPError:
         return []
     finally:
         if uf: uf.close()

+
+# =================
+# = Pull requests =
+# =================
+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} )