##// END OF EJS Templates
summary: fixed 500 errors on loading just summary commits and missing clone_url set....
ergo -
r3545:b36b008a default
parent child Browse files
Show More
@@ -152,6 +152,26 b' class RepoSummaryView(RepoAppView):'
152 c.comments = self.db_repo.get_comments(page_ids)
152 c.comments = self.db_repo.get_comments(page_ids)
153 c.statuses = self.db_repo.statuses(page_ids)
153 c.statuses = self.db_repo.statuses(page_ids)
154
154
155 def _prepare_and_set_clone_url(self, c):
156 username = ''
157 if self._rhodecode_user.username != User.DEFAULT_USER:
158 username = safe_str(self._rhodecode_user.username)
159
160 _def_clone_uri = _def_clone_uri_id = c.clone_uri_tmpl
161 _def_clone_uri_ssh = c.clone_uri_ssh_tmpl
162
163 if '{repo}' in _def_clone_uri:
164 _def_clone_uri_id = _def_clone_uri.replace('{repo}', '_{repoid}')
165 elif '{repoid}' in _def_clone_uri:
166 _def_clone_uri_id = _def_clone_uri.replace('_{repoid}', '{repo}')
167
168 c.clone_repo_url = self.db_repo.clone_url(
169 user=username, uri_tmpl=_def_clone_uri)
170 c.clone_repo_url_id = self.db_repo.clone_url(
171 user=username, uri_tmpl=_def_clone_uri_id)
172 c.clone_repo_url_ssh = self.db_repo.clone_url(
173 uri_tmpl=_def_clone_uri_ssh, ssh=True)
174
155 @LoginRequired()
175 @LoginRequired()
156 @HasRepoPermissionAnyDecorator(
176 @HasRepoPermissionAnyDecorator(
157 'repository.read', 'repository.write', 'repository.admin')
177 'repository.read', 'repository.write', 'repository.admin')
@@ -160,6 +180,7 b' class RepoSummaryView(RepoAppView):'
160 renderer='rhodecode:templates/summary/summary_commits.mako')
180 renderer='rhodecode:templates/summary/summary_commits.mako')
161 def summary_commits(self):
181 def summary_commits(self):
162 c = self.load_default_context()
182 c = self.load_default_context()
183 self._prepare_and_set_clone_url(c)
163 self._load_commits_context(c)
184 self._load_commits_context(c)
164 return self._get_template_context(c)
185 return self._get_template_context(c)
165
186
@@ -179,26 +200,7 b' class RepoSummaryView(RepoAppView):'
179 c = self.load_default_context()
200 c = self.load_default_context()
180
201
181 # Prepare the clone URL
202 # Prepare the clone URL
182 username = ''
203 self._prepare_and_set_clone_url(c)
183 if self._rhodecode_user.username != User.DEFAULT_USER:
184 username = safe_str(self._rhodecode_user.username)
185
186 _def_clone_uri = _def_clone_uri_id = c.clone_uri_tmpl
187 _def_clone_uri_ssh = c.clone_uri_ssh_tmpl
188
189 if '{repo}' in _def_clone_uri:
190 _def_clone_uri_id = _def_clone_uri.replace(
191 '{repo}', '_{repoid}')
192 elif '{repoid}' in _def_clone_uri:
193 _def_clone_uri_id = _def_clone_uri.replace(
194 '_{repoid}', '{repo}')
195
196 c.clone_repo_url = self.db_repo.clone_url(
197 user=username, uri_tmpl=_def_clone_uri)
198 c.clone_repo_url_id = self.db_repo.clone_url(
199 user=username, uri_tmpl=_def_clone_uri_id)
200 c.clone_repo_url_ssh = self.db_repo.clone_url(
201 uri_tmpl=_def_clone_uri_ssh, ssh=True)
202
204
203 # If enabled, get statistics data
205 # If enabled, get statistics data
204
206
General Comments 0
You need to be logged in to leave comments. Login now