##// END OF EJS Templates
fixes issue #166, made clone-uri use the pylons build in url generators, that way it's more safe.
marcink -
r1249:13b507b7 beta
parent child Browse files
Show More
@@ -25,7 +25,7
25
25
26 import logging
26 import logging
27
27
28 from pylons import tmpl_context as c, request
28 from pylons import tmpl_context as c, request, url
29
29
30 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
30 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
31 from rhodecode.lib.base import BaseRepoController, render
31 from rhodecode.lib.base import BaseRepoController, render
@@ -42,10 +42,16 class ShortlogController(BaseRepoControl
42 def __before__(self):
42 def __before__(self):
43 super(ShortlogController, self).__before__()
43 super(ShortlogController, self).__before__()
44
44
45 def index(self):
45 def index(self, repo_name):
46 p = int(request.params.get('page', 1))
46 p = int(request.params.get('page', 1))
47 size = int(request.params.get('size', 20))
48
49 def url_generator(**kw):
50 return url('shortlog_home', repo_name=repo_name, size=size, **kw)
51
47 c.repo_changesets = RepoPage(c.rhodecode_repo, page=p,
52 c.repo_changesets = RepoPage(c.rhodecode_repo, page=p,
48 items_per_page=20)
53 items_per_page=size,
54 url=url_generator)
49 c.shortlog_data = render('shortlog/shortlog_data.html')
55 c.shortlog_data = render('shortlog/shortlog_data.html')
50 if request.params.get('partial'):
56 if request.params.get('partial'):
51 return c.shortlog_data
57 return c.shortlog_data
@@ -70,7 +70,7 class SummaryController(BaseRepoControll
70 self.rhodecode_user.user_id)
70 self.rhodecode_user.user_id)
71
71
72 def url_generator(**kw):
72 def url_generator(**kw):
73 return url('shortlog_home', repo_name=repo_name, **kw)
73 return url('shortlog_home', repo_name=repo_name, size=10, **kw)
74
74
75 c.repo_changesets = RepoPage(c.rhodecode_repo, page=1,
75 c.repo_changesets = RepoPage(c.rhodecode_repo, page=1,
76 items_per_page=10, url=url_generator)
76 items_per_page=10, url=url_generator)
@@ -83,13 +83,18 class SummaryController(BaseRepoControll
83 username = str(self.rhodecode_user.username)
83 username = str(self.rhodecode_user.username)
84 password = '@'
84 password = '@'
85
85
86 uri = u'%(proto)s://%(user)s%(pass)s%(host)s%(prefix)s/%(repo_name)s' \
86 if e.get('wsgi.url_scheme') == 'https':
87 % {'proto': e.get('wsgi.url_scheme'),
87 split_s = 'https://'
88 'user': username,
88 else:
89 'pass': password,
89 split_s = 'http://'
90 'host': e.get('HTTP_HOST'),
90
91 'prefix': e.get('SCRIPT_NAME'),
91 qualified_uri = [split_s] + [url.current(qualified=True)\
92 'repo_name': repo_name, }
92 .split(split_s)[-1]]
93 uri = u'%(proto)s%(user)s%(pass)s%(rest)s' \
94 % {'user': username,
95 'pass': password,
96 'proto': qualified_uri[0],
97 'rest': qualified_uri[1]}
93 c.clone_repo_url = uri
98 c.clone_repo_url = uri
94 c.repo_tags = OrderedDict()
99 c.repo_tags = OrderedDict()
95 for name, hash in c.rhodecode_repo.tags.items()[:10]:
100 for name, hash in c.rhodecode_repo.tags.items()[:10]:
@@ -133,8 +138,8 class SummaryController(BaseRepoControll
133 c.commit_data = stats.commit_activity
138 c.commit_data = stats.commit_activity
134 c.overview_data = stats.commit_activity_combined
139 c.overview_data = stats.commit_activity_combined
135
140
136 lang_stats = [(x, {"count":y,
141 lang_stats = [(x, {"count": y,
137 "desc":LANGUAGES_EXTENSIONS_MAP.get(x)})
142 "desc": LANGUAGES_EXTENSIONS_MAP.get(x)})
138 for x, y in lang_stats.items()]
143 for x, y in lang_stats.items()]
139 print lang_stats
144 print lang_stats
140
145
General Comments 0
You need to be logged in to leave comments. Login now