From: Łukasz Rekucki Date: Sat, 26 Sep 2009 12:10:53 +0000 (+0200) Subject: Updates of the main view. X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/15f3b1ec20246e7935176a743cc95b4863e6ce24?hp=0b7e02cf796af7d3028efabeb37473f9198d0af2 Updates of the main view. --- diff --git a/apps/explorer/views.py b/apps/explorer/views.py index 889fda5c..e3ca63a7 100644 --- a/apps/explorer/views.py +++ b/apps/explorer/views.py @@ -22,6 +22,8 @@ from toolbar import models as toolbar_models from django.forms.util import ErrorList +import wlrepo + # # Some useful decorators @@ -36,7 +38,7 @@ def file_path(fileid): 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'] = wlrepo.MercurialLibrary(settings.REPOSITORY_PATH) return view(request, *args, **kwargs) return view_with_repo @@ -55,20 +57,11 @@ def ajax_login_required(view): # View all files # @with_repo -def file_list(request, repo): - # - latest_default = repo.get_branch_tip('default') - - fl = [] - for file in repo.repo[latest_default]: - m = re.match(u'^pub_([^/]+).xml$', file.decode('utf-8'), re.UNICODE) - if m is not None: - fl.append(m.group(1)) - - bookform = forms.BookUploadForm() - +def file_list(request, repo): + import api.forms + bookform = api.forms.DocumentUploadForm() return direct_to_template(request, 'explorer/file_list.html', extra_context={ - 'files': fl, 'bookform': bookform, + 'files': repo.documents(), 'bookform': bookform, }) @permission_required('explorer.can_add_files') diff --git a/project/templates/explorer/file_list.html b/project/templates/explorer/file_list.html index 7612a71e..bf6758f2 100644 --- a/project/templates/explorer/file_list.html +++ b/project/templates/explorer/file_list.html @@ -81,10 +81,8 @@ $(function() { {% if perms.explorer.can_add_files %}

Dodaj nowy utwór

-
-

-

-

+ + {{ bookform }}