X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/96647893c5a1e2c675fc2b1bf1d7ca16fe3253b8..161c28b8083a89516b04082d5eee1a9a9e944fa6:/apps/explorer/views.py

diff --git a/apps/explorer/views.py b/apps/explorer/views.py
index ffe5973d..ea031216 100644
--- a/apps/explorer/views.py
+++ b/apps/explorer/views.py
@@ -1,5 +1,5 @@
 from librarian import html
-import hg, urllib2
+import hg, urllib2, time
 from django.utils import simplejson as json
 
 from django.views.generic.simple import direct_to_template
@@ -10,76 +10,113 @@ from django.contrib.auth.decorators import login_required
 
 from explorer import forms, models
 
-repo = hg.Repository(settings.REPOSITORY_PATH)
 
-def file_list(request):
+def with_repo(func):
+    def inner(request, *args, **kwargs):          
+        kwargs['repo'] = hg.Repository(settings.REPOSITORY_PATH)
+        return func(request, *args, **kwargs)
+    return inner
+
+@with_repo
+def file_list(request, repo):
     return direct_to_template(request, 'explorer/file_list.html', extra_context={
         'objects': repo.all_files(),
     })
+#
+# Edit the file
+#
 
-def file_xml(request, path):
+@with_repo
+def file_xml(request, repo, path):
     if request.method == 'POST':
         form = forms.BookForm(request.POST)
         if form.is_valid():
-            # save the changes to a local branch
-#           repo.write_lock()
-            print request.user
-#            repo.switch_to_branch(request.user.name)           
-#            repo.add_file(path, form.cleaned_data['text'])
-            
-            # 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 HttpResponse( json.dumps({'message': commit_message}) )
+            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)
+
+            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}) );
     else:
         form = forms.BookForm()
-        form.fields['text'].initial = repo.get_file(path).data()
-    
-    return direct_to_template(request, 'explorer/file_xml.html', extra_context={
-        'hash': path,
+        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,
+    })
+
+@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"
+        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,
-        'image_folders_form': forms.ImageFoldersForm(),
+        'fpath': path,
     })
 
+# Display the main editor view
+def display_editor(request, path):
+    return direct_to_template(request, 'explorer/editor.html', extra_context={
+        'hash': path,
+    })
 
 # ===============
 # = Panel views =
 # ===============
-def xmleditor_panel(request, path):
+
+@with_repo
+def xmleditor_panel(request, path, repo):
     form = forms.BookForm()
-    text = repo.get_file(path).data()
+    text = repo.get_file(path, models.user_branch(request.user))
     
     return direct_to_template(request, 'explorer/panels/xmleditor.html', extra_context={
+        'fpath': path,
         'text': text,
     })
     
 
 def gallery_panel(request, path):
     return direct_to_template(request, 'explorer/panels/gallery.html', extra_context={
+        'fpath': path,
         'form': forms.ImageFoldersForm(),
     })
 
-
-def htmleditor_panel(request, path):
+@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={
-        'html': html.transform(repo.get_file(path).data(), is_file=False),
+        'fpath': path,
+        'html': html.transform(repo.get_file(path, user_branch), is_file=False),
     })
  
 
-def dceditor_panel(request, path):
-    if request.method == 'POST':
-        form = forms.DublinCoreForm(request.POST)
-        if form.is_valid():
-            form.save(repo, path)
-            repo.commit(message='%s: DublinCore edited' % path)
-    else:
-        text = repo.get_file(path).data()
-        form = forms.DublinCoreForm(text=text)       
+@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,
     })