X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/1a2a6714d405526c16ac4f0900b6dfb0c4c83b6a..3bf45c83c84f9e7a1c5f2dafd64d812c987037e5:/apps/explorer/views.py?ds=sidebyside diff --git a/apps/explorer/views.py b/apps/explorer/views.py index 52ff9630..ef2a3962 100644 --- a/apps/explorer/views.py +++ b/apps/explorer/views.py @@ -61,7 +61,7 @@ def file_list(request, repo): fl = [] for file in repo.repo[latest_default]: - m = re.match(u'^pub_([\\w\\$0-9_-]+).xml$', file.decode('utf-8'), re.UNICODE) + m = re.match(u'^pub_([^/]+).xml$', file.decode('utf-8'), re.UNICODE) if m is not None: fl.append(m.group(1)) @@ -307,7 +307,7 @@ def file_commit(request, path, repo): @with_repo def file_dc(request, path, repo): errors = None - rpath = file_path(fileid) + rpath = file_path(path) if request.method == 'POST': form = forms.DublinCoreForm(request.POST) @@ -422,7 +422,9 @@ class panel_view(object): rpath = file_path(path) user_branch = file_branch(path, request.user) try: - return {'html': html.transform(repo.get_file(rpath, user_branch), is_file=False)} + result = html.transform(repo.get_file(rpath, user_branch), is_file=False) + print "HTML: %r" % result + return {'html': result} except (ParseError, ValidationError), e: return direct_to_template(request, 'explorer/panels/parse_error.html', extra_context={ 'fileid': path, 'exception_type': type(e).__name__, 'exception': e,