Dodanie daty ostatniego uaktualnienia ustawień do ustawień w cookie w pliku editor.js.

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

diff --git a/apps/explorer/views.py b/apps/explorer/views.py
index 896ed09..585edcc 100644 (file)
--- a/apps/explorer/views.py
+++ b/apps/explorer/views.py
@@ -1,31 +1,89 @@
 from librarian import html
 import hg, urllib2, time
 from librarian import html
 import hg, urllib2, time

+

 from django.utils import simplejson as json
 from django.utils import simplejson as json

+from lxml import etree
+from librarian import dcparser

 
 from django.views.generic.simple import direct_to_template
 
 from django.conf import settings
 from django.http import HttpResponseRedirect, HttpResponse
 
 from django.views.generic.simple import direct_to_template
 
 from django.conf import settings
 from django.http import HttpResponseRedirect, HttpResponse

-from django.contrib.auth.decorators import login_required

 
 

-from explorer import forms, models
+from django.core.urlresolvers import reverse
+from django.core.paginator import Paginator, InvalidPage, EmptyPage

 
 

+from django.contrib.auth.decorators import login_required, permission_required

 
 

-def with_repo(func):
-    def inner(request, *args, **kwargs):          
+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)
         kwargs['repo'] = hg.Repository(settings.REPOSITORY_PATH)

-        return func(request, *args, **kwargs)
-    return inner
+        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."""
+    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'}) );
+    return view_with_auth

 
 

+#
+# View all files
+#

 @with_repo
 def file_list(request, repo):
 @with_repo
 def file_list(request, repo):

+    paginator = Paginator( repo.file_list('default'), 100);
+    bookform = forms.BookUploadForm()
+
+    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)
+

     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(),
+        'files': files, 'page': page, 'bookform': bookform,

     })
     })

+
+@permission_required('explorer.can_add_files')
+@with_repo
+def file_upload(request, repo):
+    form = forms.BookUploadForm(request.POST, request.FILES)
+    if form.is_valid():
+        f = request.FILES['file']        
+
+        def upload_action():
+            print 'Adding file: %s' % f.name
+            repo._add_file(f.name, f.read().decode('utf-8'))
+            repo._commit(message="File %s uploaded from platform by %s" %
+                (f.name, request.user.username), user=request.user.username)
+
+        repo.in_branch(upload_action, 'default')
+        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
 #
 
 #
 # Edit the file
 #
 

+@ajax_login_required

 @with_repo
 def file_xml(request, repo, path):
     if request.method == 'POST':
 @with_repo
 def file_xml(request, repo, path):
     if request.method == 'POST':


@@ -34,9 +92,8 @@ def file_xml(request, repo, path):
             print 'Saving whole text.', request.user.username
             def save_action():
                 print 'In branch: ' + repo.repo[None].branch()
             print 'Saving whole text.', request.user.username
             def save_action():
                 print 'In branch: ' + repo.repo[None].branch()

-                print repo._add_file(path, form.cleaned_data['content'])
-                print repo.repo.status()
-                print repo._commit(message='Local save at %s' % time.ctime(), user=request.user.username)
+                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"
 
             print repo.in_branch(save_action, models.user_branch(request.user) );
             result = "ok"


@@ -45,35 +102,51 @@ def file_xml(request, repo, path):
 
         errors = dict( (field[0], field[1].as_text()) for field in form.errors.iteritems() )
         return HttpResponse( json.dumps({'result': result, 'errors': errors}) );
 
         errors = dict( (field[0], field[1].as_text()) for field in form.errors.iteritems() )
         return HttpResponse( json.dumps({'result': result, 'errors': errors}) );

-    else:
-        form = forms.BookForm()
-        form.fields['content'].initial = repo.get_file(path, models.user_branch(request.user))
-    return direct_to_template(request, 'explorer/edit_text.html', extra_context={
-        'form': form,
-    })

 
 

+    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)
 @with_repo
 def file_dc(request, path, repo):
     if request.method == 'POST':
         form = forms.DublinCoreForm(request.POST)

+        

         if form.is_valid():
         if form.is_valid():

-            form.save(repo, path)
+            def save_action():
+                file_contents = repo._get_file(path)
+                doc = etree.fromstring(file_contents)
+
+                book_info = dcparser.BookInfo()
+                for name, value in form.cleaned_data.items():
+                    if value is not None and value != '':
+                        setattr(book_info, name, value)
+                rdf = etree.XML(book_info.to_xml())
+
+                old_rdf = doc.getroottree().find('//{http://www.w3.org/1999/02/22-rdf-syntax-ns#}RDF')
+                old_rdf.getparent().remove(old_rdf)
+                doc.insert(0, rdf)
+                repo._add_file(path, etree.tostring(doc, pretty_print=True, encoding=unicode))
+                repo._commit(message=(form.cleaned_data['commit_message'] or 'Lokalny zapis platformy.'), user=request.user.username)
+
+            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}) );
             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}) );

-    else:
-        fulltext = repo.get_file(path, models.user_branch(request.user))
-        form = forms.DublinCoreForm(text=fulltext)       
-
-    return direct_to_template(request, 'explorer/edit_dc.html', extra_context={
-        'form': form,
-        'fpath': path,
-    })
+    
+    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
 
 # Display the main editor view

+
+@login_required

 def display_editor(request, path):
     return direct_to_template(request, 'explorer/editor.html', extra_context={
         'hash': path, 'panel_list': ['lewy', 'prawy'],
 def display_editor(request, path):
     return direct_to_template(request, 'explorer/editor.html', extra_context={
         'hash': path, 'panel_list': ['lewy', 'prawy'],


@@ -83,6 +156,7 @@ def display_editor(request, path):
 # = Panel views =
 # ===============
 
 # = Panel views =
 # ===============
 

+@ajax_login_required

 @with_repo
 def xmleditor_panel(request, path, repo):
     form = forms.BookForm()
 @with_repo
 def xmleditor_panel(request, path, repo):
     form = forms.BookForm()


@@ -94,12 +168,14 @@ def xmleditor_panel(request, path, repo):
     })
     
 
     })
     
 

+@ajax_login_required

 def gallery_panel(request, path):
     return direct_to_template(request, 'explorer/panels/gallery.html', extra_context={
         'fpath': path,
         'form': forms.ImageFoldersForm(),
     })
 
 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)
 @with_repo
 def htmleditor_panel(request, path, repo):
     user_branch = models.user_branch(request.user)


@@ -109,6 +185,7 @@ def htmleditor_panel(request, path, repo):
     })
  
 
     })
  
 

+@ajax_login_required

 @with_repo
 def dceditor_panel(request, path, repo):
     user_branch = models.user_branch(request.user)
 @with_repo
 def dceditor_panel(request, path, repo):
     user_branch = models.user_branch(request.user)


@@ -124,6 +201,7 @@ def dceditor_panel(request, path, repo):
 # =================
 # = Utility views =
 # =================
 # =================
 # = 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),
 def folder_images(request, folder):
     return direct_to_template(request, 'explorer/folder_images.html', extra_context={
         'images': models.get_images_from_folder(folder),


@@ -147,3 +225,11 @@ def _get_issues_for_file(path):
         return []
     finally:
         if uf: uf.close()
         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()} )