##// END OF EJS Templates
files: fixed editing of files for branches with `/` in the name....
marcink -
r1593:31d11ad7 default
parent child Browse files
Show More
@@ -241,7 +241,11 b' class FilesController(BaseRepoController'
241
241
242 c.on_branch_head = self._is_valid_head(
242 c.on_branch_head = self._is_valid_head(
243 commit_id, c.rhodecode_repo)
243 commit_id, c.rhodecode_repo)
244 c.branch_or_raw_id = c.commit.branch or c.commit.raw_id
244
245 branch = c.commit.branch if (
246 c.commit.branch and '/' not in c.commit.branch) else None
247 c.branch_or_raw_id = branch or c.commit.raw_id
248 c.branch_name = c.commit.branch or h.short_id(c.commit.raw_id)
245
249
246 author = c.file_last_commit.author
250 author = c.file_last_commit.author
247 c.authors = [(h.email(author),
251 c.authors = [(h.email(author),
@@ -40,7 +40,7 b''
40 |
40 |
41 %if c.on_branch_head and c.branch_or_raw_id and not c.file.is_binary:
41 %if c.on_branch_head and c.branch_or_raw_id and not c.file.is_binary:
42 <a href="${h.url('files_edit_home',repo_name=c.repo_name,revision=c.branch_or_raw_id,f_path=c.f_path, anchor='edit')}">
42 <a href="${h.url('files_edit_home',repo_name=c.repo_name,revision=c.branch_or_raw_id,f_path=c.f_path, anchor='edit')}">
43 ${_('Edit on Branch:%s') % c.branch_or_raw_id}
43 ${_('Edit on Branch:%s') % c.branch_name}
44 </a>
44 </a>
45 | <a class="btn-danger btn-link" href="${h.url('files_delete_home',repo_name=c.repo_name,revision=c.branch_or_raw_id,f_path=c.f_path, anchor='edit')}">${_('Delete')}
45 | <a class="btn-danger btn-link" href="${h.url('files_delete_home',repo_name=c.repo_name,revision=c.branch_or_raw_id,f_path=c.f_path, anchor='edit')}">${_('Delete')}
46 </a>
46 </a>
General Comments 0
You need to be logged in to leave comments. Login now