Naprawiony błąd layout-u.

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

diff --git a/apps/explorer/views.py b/apps/explorer/views.py
index acbcd19..eeac7b6 100644 (file)
--- a/apps/explorer/views.py
+++ b/apps/explorer/views.py
@@ -1,9 +1,12 @@
 from librarian import html
 from librarian import html

-import hg, urllib2, json
+import hg, urllib2
+from django.utils import simplejson as json

 
 from django.views.generic.simple import direct_to_template
 
 from django.views.generic.simple import direct_to_template

+

 from django.conf import settings
 from django.http import HttpResponseRedirect
 from django.conf import settings
 from django.http import HttpResponseRedirect

+from django.contrib.auth.decorators import login_required

 
 from explorer import forms, models
 
 
 from explorer import forms, models
 


@@ -14,15 +17,18 @@ def file_list(request):
         'objects': repo.all_files(),
     })
 
         'objects': repo.all_files(),
     })
 

-

 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'])
 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'])

-            # issues = _get_issues_for_file(path)
-            # commit_message = _add_references(form.cleaned_data['commit_message'], issued)
-            repo.commit(message=form.cleaned_data['commit_message'], user=form.cleaned_data['user'])
+            
+            # 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()
             return HttpResponseRedirect(request.get_full_path())
     else:
         form = forms.BookForm()


@@ -35,31 +41,49 @@ def file_xml(request, path):
     })
 
 
     })
 
 

-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(),
+# ===============
+# = Panel views =
+# ===============
+def xmleditor_panel(request, path):
+    form = forms.BookForm()
+    text = repo.get_file(path).data()
+    
+    return direct_to_template(request, 'explorer/panels/xmleditor.html', extra_context={
+        'text': text,

     })
     })

-  
+    
+
+def gallery_panel(request, path):
+    return direct_to_template(request, 'explorer/panels/gallery.html', extra_context={
+        'form': forms.ImageFoldersForm(),
+    })
+
+
+def htmleditor_panel(request, path):
+    return direct_to_template(request, 'explorer/panels/htmleditor.html', extra_context={
+        'html': html.transform(repo.get_file(path).data(), is_file=False),
+    })
+ 
+

 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):
 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):

-    for issue in issues:
-        message += " refs #%d " % issue.id
-    return message
+    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')
 
 
 def _get_issues_for_file(path):
     if not path.endswith('.xml'):
         raise ValueError('Path must end with .xml')
 

-    book_id = path[:-3]
-    uf = urllib2.urlopen(settings.REDMINE_URL + 'publications/%s/issues' % book_id)
+    book_id = path[:-4]
+    uf = None

 
     try:
 
     try:

+        uf = urllib2.urlopen(settings.REDMINE_URL + 'publications/issues/%s.json' % book_id)

         return json.loads(uf.read())
         return json.loads(uf.read())

+    except urllib2.HTTPError:
+        return []

     finally:
     finally:

-        uf.close()
+        if uf: uf.close()