Browse Source

Fix 7303 - remove unnessesary buttons on archived repos (#7326)

* archived repo - remove
- open/close button on issue list
- assigne person on issue list

Signed-off-by: Michael Gnehr <michael@gnehr.de>

* archived repo - remove
- comment field on issue view
- lock/unlock issue conversation button from sidebar on issue view

Signed-off-by: Michael Gnehr <michael@gnehr.de>

* archived repo - add 'compare commits' button to pull request

+ remove new pull request button from compare view

as the route is still working, and there is no need to be hidden

Signed-off-by: Michael Gnehr <michael@gnehr.de>
for-closed-social
Cherrg 5 years ago
committed by zeripath
parent
commit
711f6dc9b0
5 changed files with 15 additions and 2 deletions
  1. +1
    -0
      options/locale/locale_en-US.ini
  2. +2
    -0
      templates/repo/diff/compare.tmpl
  3. +8
    -0
      templates/repo/issue/list.tmpl
  4. +3
    -1
      templates/repo/issue/view_content.tmpl
  5. +1
    -1
      templates/repo/issue/view_content/sidebar.tmpl

+ 1
- 0
options/locale/locale_en-US.ini View File

@ -1866,6 +1866,7 @@ push_tag = pushed tag %[2]s to %[3]s
delete_tag = deleted tag %[2]s from <a href="%[1]s">%[3]s</a>
delete_branch = deleted branch %[2]s from <a href="%[1]s">%[3]s</a>
compare_commits = Compare %d commits
compare_commits_general = Compare commits
mirror_sync_push = synced commits to <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a> from mirror
mirror_sync_create = synced new reference <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a> from mirror
mirror_sync_delete = synced and deleted reference <code>%[2]s</code> at <a href="%[1]s">%[3]s</a> from mirror

+ 2
- 0
templates/repo/diff/compare.tmpl View File

@ -56,9 +56,11 @@
{{.i18n.Tr "repo.pulls.has_pull_request" $.RepoLink $.RepoRelPath .PullRequest.Index | Safe}}
</div>
{{else}}
{{if not .Repository.IsArchived}}
<div class="ui info message show-form-container">
<button class="ui button green show-form">{{.i18n.Tr "repo.pulls.new"}}</button>
</div>
{{end}}
<div class="pullrequest-form" style="display: none">
{{template "repo/issue/new_form" .}}
</div>

+ 8
- 0
templates/repo/issue/list.tmpl View File

@ -17,6 +17,12 @@
<a class="ui green button {{if not .PullRequestCtx.Allowed}}disabled{{end}}" href="{{if .PullRequestCtx.Allowed}}{{.PullRequestCtx.BaseRepo.Link}}/compare/{{.PullRequestCtx.BaseRepo.DefaultBranch | EscapePound}}...{{if ne .Repository.Owner.Name .PullRequestCtx.BaseRepo.Owner.Name}}{{.Repository.Owner.Name}}:{{end}}{{.Repository.DefaultBranch | EscapePound}}{{end}}">{{.i18n.Tr "repo.pulls.new"}}</a>
{{end}}
</div>
{{else}}
{{if not .PageIsIssueList}}
<div class="column right aligned">
<a class="ui green button {{if not .PullRequestCtx.Allowed}}disabled{{end}}" href="{{if .PullRequestCtx.Allowed}}{{.PullRequestCtx.BaseRepo.Link}}/compare/{{.PullRequestCtx.BaseRepo.DefaultBranch | EscapePound}}...{{if ne .Repository.Owner.Name .PullRequestCtx.BaseRepo.Owner.Name}}{{.Repository.Owner.Name}}:{{end}}{{.Repository.DefaultBranch | EscapePound}}{{end}}">{{$.i18n.Tr "action.compare_commits_general"}}</a>
</div>
{{end}}
{{end}}
</div>
<div class="ui divider"></div>
@ -132,6 +138,7 @@
this one correctly, but not the other one. */}}
<div class="nine wide right aligned right floated column">
<div class="ui secondary filter stackable menu">
{{if not .Repository.IsArchived}}
<!-- Action Button -->
{{if .IsShowClosed}}
<div class="ui green active basic button issue-action" data-action="open" data-url="{{$.RepoLink}}/issues/status" style="margin-left: auto">{{.i18n.Tr "repo.issues.action_open"}}</div>
@ -188,6 +195,7 @@
{{end}}
</div>
</div>
{{end}}
</div>
</div>
</div>

+ 3
- 1
templates/repo/issue/view_content.tmpl View File

@ -70,7 +70,7 @@
{{ template "repo/issue/view_content/pull". }}
{{end}}
{{if .IsSigned}}
{{ if or .IsRepoAdmin .IsRepoIssuesWriter (or (not .Issue.IsLocked)) }}
{{ if and (or .IsRepoAdmin .IsRepoIssuesWriter (or (not .Issue.IsLocked))) (not .Repository.IsArchived) }}
<div class="comment form">
<a class="avatar" href="{{.SignedUser.HomeLink}}">
<img src="{{.SignedUser.RelAvatarLink}}">
@ -111,6 +111,7 @@
</div>
{{else}}
{{if .IsSigned}}
{{if .Repository.IsArchived}}
<div class="comment form">
<a class="avatar" href="{{.SignedUser.HomeLink}}">
<img src="{{.SignedUser.RelAvatarLink}}">
@ -139,6 +140,7 @@
</form>
</div>
</div>
{{end}}
{{else}}
<div class="ui warning message">
{{.i18n.Tr "repo.issues.sign_in_require_desc" .SignInLink | Safe}}

+ 1
- 1
templates/repo/issue/view_content/sidebar.tmpl View File

@ -336,7 +336,7 @@
{{end}}
</div>
{{ if .IsRepoAdmin }}
{{ if and .IsRepoAdmin (not .Repository.IsArchived) }}
<div class="ui divider"></div>
<div class="ui watching">
<div>

Loading…
Cancel
Save