X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/275dc6c6f5c92630c9a1fca0f1830ba543cd18b7..0a8fdf777d7f183cb83b3db47c23c12e7cfc6c45:/apps/explorer/views.py

diff --git a/apps/explorer/views.py b/apps/explorer/views.py
index eeac7b65..ffe5973d 100644
--- a/apps/explorer/views.py
+++ b/apps/explorer/views.py
@@ -5,7 +5,7 @@ from django.utils import simplejson as json
 from django.views.generic.simple import direct_to_template
 
 from django.conf import settings
-from django.http import HttpResponseRedirect
+from django.http import HttpResponseRedirect, HttpResponse
 from django.contrib.auth.decorators import login_required
 
 from explorer import forms, models
@@ -21,15 +21,19 @@ 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'])
+            # 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 HttpResponseRedirect(request.get_full_path())
+#            repo.commit(message=commit_message, user=form.cleaned_data['user'])
+        return HttpResponse( json.dumps({'message': commit_message}) )
     else:
         form = forms.BookForm()
         form.fields['text'].initial = repo.get_file(path).data()
@@ -65,11 +69,30 @@ def htmleditor_panel(request, path):
     })
  
 
+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)       
+
+    return direct_to_template(request, 'explorer/panels/dceditor.html', extra_context={
+        'form': form,
+    })
+
+
+# =================
+# = Utility views =
+# =================
 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))