fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Zapis na serwer na Gecko/Webkit/Opera.
[redakcja.git]
/
apps
/
explorer
/
views.py
diff --git
a/apps/explorer/views.py
b/apps/explorer/views.py
old mode 100644
(file)
new mode 100755
(executable)
index
b17b8c8
..
fd99f27
--- a/
apps/explorer/views.py
+++ b/
apps/explorer/views.py
@@
-11,6
+11,8
@@
from django.core.urlresolvers import reverse
from django.http import HttpResponse
from django.utils import simplejson as json
from django.views.generic.simple import direct_to_template
from django.http import HttpResponse
from django.utils import simplejson as json
from django.views.generic.simple import direct_to_template
+from django.shortcuts import render_to_response
+from django.template import RequestContext
from django.contrib.auth.decorators import login_required
from api.models import PullRequest
from django.contrib.auth.decorators import login_required
from api.models import PullRequest
@@
-29,11
+31,13
@@
def ajax_login_required(view):
def display_editor(request, path):
user = request.GET.get('user', request.user.username)
log.info(user)
def display_editor(request, path):
user = request.GET.get('user', request.user.username)
log.info(user)
-
- return direct_to_template(request, 'explorer/editor.html', extra_context={
+
+ return render_to_response('explorer/editor.html',
+ mimetype="text/html",
+ dictionary = {
'fileid': path,
'euser': user
'fileid': path,
'euser': user
-
}
)
+
}, context_instance=RequestContext(request)
)
#
# View all files
#
# View all files
@@
-109,11
+113,18
@@
def _get_issues_for_file(fileid):
# = Pull requests =
# =================
def pull_requests(request):
# = Pull requests =
# =================
def pull_requests(request):
- objects = PullRequest.objects.order_by('
status
')
+ objects = PullRequest.objects.order_by('
-status', 'timestamp
')
if not request.user.has_perm('explorer.book.can_share'):
objects = objects.filter(comitter=request.user)
if not request.user.has_perm('explorer.book.can_share'):
objects = objects.filter(comitter=request.user)
-
return direct_to_template(request, 'manager/pull_request.html',
extra_context = {'objects': objects} )
return direct_to_template(request, 'manager/pull_request.html',
extra_context = {'objects': objects} )
+
+
+#
+# Testing
+#
+def renderer_test(request):
+ return direct_to_template(request, 'renderer.html', mimetype="application/xhtml+xml",
+ extra_context = {} )
\ No newline at end of file