diff --git a/rhodecode/templates/admin/repos_groups/repos_groups_show.html b/rhodecode/templates/admin/repos_groups/repos_groups_show.html --- a/rhodecode/templates/admin/repos_groups/repos_groups_show.html +++ b/rhodecode/templates/admin/repos_groups/repos_groups_show.html @@ -53,13 +53,13 @@ ${h.submit('edit_%s' % gr.group_name,_('edit'),class_="edit_icon action_button")} - + ${h.form(url('repos_group', id=gr.group_id),method='delete')} ${h.submit('remove_%s' % gr.name,_('delete'),class_="delete_icon action_button",onclick="return confirm('"+ungettext('Confirm to delete this group: %s with %s repository','Confirm to delete this group: %s with %s repositories',gr_cn) % (gr.name,gr_cn)+"');")} ${h.end_form()} - + % endfor diff --git a/rhodecode/templates/base/base.html b/rhodecode/templates/base/base.html --- a/rhodecode/templates/base/base.html +++ b/rhodecode/templates/base/base.html @@ -159,7 +159,7 @@ - ## we render this menu only not for those pages + ## we render this menu only not for those pages %if current not in ['home','admin', 'search', 'journal']: ##REGULAR MENU
  • @@ -342,7 +342,7 @@ } q_filter(target,nodes,func); } - + var loaded = YUD.hasClass('repo_switcher','loaded'); if(!loaded){ YUD.addClass('repo_switcher','loaded'); diff --git a/rhodecode/templates/changeset/changeset_file_comment.html b/rhodecode/templates/changeset/changeset_file_comment.html --- a/rhodecode/templates/changeset/changeset_file_comment.html +++ b/rhodecode/templates/changeset/changeset_file_comment.html @@ -31,11 +31,11 @@ %else: ${_('Comment from pull request %s') % co.pull_request.pull_request_id} %endif - + %endif - + %if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id:
    ${_('Delete')} diff --git a/rhodecode/templates/pullrequests/pullrequest_show.html b/rhodecode/templates/pullrequests/pullrequest_show.html --- a/rhodecode/templates/pullrequests/pullrequest_show.html +++ b/rhodecode/templates/pullrequests/pullrequest_show.html @@ -64,11 +64,11 @@ ##%endif ${c.pull_request.org_ref_parts[0]} : - ${c.pull_request.org_ref_parts[1]} - ${c.pull_request.org_repo.clone_url()} + ${c.pull_request.org_ref_parts[1]} + ${c.pull_request.org_repo.clone_url()}
    - +
    ${h.literal(c.pull_request.description)}
    diff --git a/rhodecode/tests/api/api_base.py b/rhodecode/tests/api/api_base.py --- a/rhodecode/tests/api/api_base.py +++ b/rhodecode/tests/api/api_base.py @@ -591,10 +591,10 @@ class BaseTestApi(object): users_group_data['type'] = "users_group" users_group_data['permission'] = perm members.append(users_group_data) - + for user in repo.followers: followers.append(user.user.get_api_data()) - + ret['members'] = members ret['followers'] = followers