Dodano wyszukiwarke na stronie glownej. Refs #75.

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

diff --git a/apps/explorer/views.py b/apps/explorer/views.py
index 0c558fb..d6118ac 100644 (file)
--- a/apps/explorer/views.py
+++ b/apps/explorer/views.py
@@ -5,7 +5,7 @@ from librarian import html, parser, dcparser, ParseError, ValidationError
 
 from django.conf import settings
 from django.contrib.auth.decorators import login_required, permission_required
 
 from django.conf import settings
 from django.contrib.auth.decorators import login_required, permission_required

-from django.core.paginator import Paginator, InvalidPage, EmptyPage
+

 from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect, HttpResponse
 from django.utils import simplejson as json
 from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect, HttpResponse
 from django.utils import simplejson as json


@@ -40,28 +40,18 @@ def ajax_login_required(view):
 #
 @with_repo
 def file_list(request, repo):
 #
 @with_repo
 def file_list(request, repo):

-    paginator = Paginator( repo.file_list('default'), 100);
+    latest_default = repo.repo.branchtags()['default']
+    files = list( repo.repo[latest_default] )

     bookform = forms.BookUploadForm()
 
     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={

-        'files': files, 'page': page, 'bookform': bookform,
+        'files': files, 'bookform': bookform,

     })
 
 @permission_required('explorer.can_add_files')
 @with_repo
 def file_upload(request, repo):
     other_errors = []
     })
 
 @permission_required('explorer.can_add_files')
 @with_repo
 def file_upload(request, repo):
     other_errors = []

-

     if request.method == 'POST':
         form = forms.BookUploadForm(request.POST, request.FILES)
         if form.is_valid():
     if request.method == 'POST':
         form = forms.BookUploadForm(request.POST, request.FILES)
         if form.is_valid():


@@ -72,7 +62,7 @@ def file_upload(request, repo):
 
                 def upload_action():
                     print 'Adding file: %s' % f.name
 
                 def upload_action():
                     print 'Adding file: %s' % f.name

-                    repo._add_file(f.name, f.read().decode('utf-8'))
+                    repo._add_file(f.name, decoded.encode('utf-8') )

                     repo._commit(
                         message="File %s uploaded from platform by %s" %\
                             (f.name, request.user.username), \
                     repo._commit(
                         message="File %s uploaded from platform by %s" %\
                             (f.name, request.user.username), \


@@ -154,7 +144,7 @@ def file_dc(request, path, repo):
                 print "SAVING DC"
 
                 # zapisz
                 print "SAVING DC"
 
                 # zapisz

-                repo._add_file(path, document.serialize())
+                repo._write_file(path, document.serialize())

                 repo._commit( \
                     message=(form.cleaned_data['commit_message'] or 'Lokalny zapis platformy.'), \
                     user=request.user.username )
                 repo._commit( \
                     message=(form.cleaned_data['commit_message'] or 'Lokalny zapis platformy.'), \
                     user=request.user.username )


@@ -185,7 +175,24 @@ def file_dc(request, path, repo):
 # Display the main editor view
 
 @login_required
 # Display the main editor view
 
 @login_required

-def display_editor(request, path):
+@with_repo
+def display_editor(request, path, repo):
+    
+    if not repo.file_exists(path, models.user_branch(request.user)):
+        try:
+            data = repo.get_file(path, 'default')
+            print type(data)
+
+            def new_file():
+                repo._add_file(path, data)
+                repo._commit(message='File import from default branch',
+                    user=request.user.username)
+                
+            repo.in_branch(new_file, models.user_branch(request.user) )
+        except hg.RepositoryException, e:
+            return direct_to_template(request, 'explorer/file_unavailble.html',\
+                extra_context = { 'path': path, 'error': e })
+

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


@@ -199,7 +206,6 @@ def display_editor(request, path):
 @ajax_login_required
 @with_repo
 def xmleditor_panel(request, path, repo):
 @ajax_login_required
 @with_repo
 def xmleditor_panel(request, path, repo):

-    form = forms.BookForm()

     text = repo.get_file(path, models.user_branch(request.user))
     
     return direct_to_template(request, 'explorer/panels/xmleditor.html', extra_context={
     text = repo.get_file(path, models.user_branch(request.user))
     
     return direct_to_template(request, 'explorer/panels/xmleditor.html', extra_context={