2017-03-17 05:57:43 +00:00
|
|
|
<div class="four wide column">
|
|
|
|
|
<div class="ui segment metas">
|
2017-08-24 12:30:27 +00:00
|
|
|
{{template "repo/issue/branch_selector_field" .}}
|
|
|
|
|
|
2020-04-06 16:33:34 +00:00
|
|
|
{{if .Issue.IsPull }}
|
|
|
|
|
|
|
|
|
|
<input id="reviewer_id" name="reviewer_id" type="hidden" value="{{.reviewer_id}}">
|
2020-10-12 19:55:13 +00:00
|
|
|
<div class="ui {{if or (not .Reviewers) (not .CanChooseReviewer) .Repository.IsArchived}}disabled{{end}} floating jump select-reviewers-modify dropdown">
|
2020-04-06 16:33:34 +00:00
|
|
|
<span class="text">
|
|
|
|
|
<strong>{{.i18n.Tr "repo.issues.review.reviewers"}}</strong>
|
|
|
|
|
{{if and .CanChooseReviewer (not .Repository.IsArchived)}}
|
2020-09-11 20:19:00 +00:00
|
|
|
{{svg "octicon-gear"}}
|
2020-04-06 16:33:34 +00:00
|
|
|
{{end}}
|
|
|
|
|
</span>
|
2020-09-02 16:55:13 +00:00
|
|
|
<div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/request_review">
|
2020-04-06 16:33:34 +00:00
|
|
|
<div class="header" style="text-transform: none;font-size:16px;">{{.i18n.Tr "repo.issues.new.add_reviewer_title"}}</div>
|
|
|
|
|
{{if .Reviewers}}
|
|
|
|
|
<div class="ui icon search input">
|
2020-11-09 18:21:47 +00:00
|
|
|
<i class="icon df ac jc">{{svg "octicon-search" 16}}</i>
|
2020-04-06 16:33:34 +00:00
|
|
|
<input type="text" placeholder="{{.i18n.Tr "repo.issues.filter_reviewers"}}">
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
2020-10-12 19:55:13 +00:00
|
|
|
{{if .Reviewers}}
|
|
|
|
|
{{range .Reviewers}}
|
|
|
|
|
{{if .User}}
|
|
|
|
|
<a class="{{if not .CanChange}}ui poping up{{end}} item {{if .Checked}} checked {{end}} {{if not .CanChange}}ban-change{{end}}" href="#" data-id="{{.ItemID}}" data-id-selector="#review_request_{{.ItemID}}" {{if not .CanChange}} data-content="{{$.i18n.Tr "repo.issues.remove_request_review_block"}}"{{end}}>
|
|
|
|
|
<span class="octicon-check {{if not .Checked}}invisible{{end}}">{{svg "octicon-check"}}</span>
|
|
|
|
|
<span class="text">
|
2020-12-03 18:46:11 +00:00
|
|
|
{{avatar .User 28 "mr-3"}}
|
2020-11-12 05:55:34 +00:00
|
|
|
{{.User.GetDisplayName}}
|
2020-10-12 19:55:13 +00:00
|
|
|
</span>
|
|
|
|
|
</a>
|
2020-04-06 16:33:34 +00:00
|
|
|
{{end}}
|
|
|
|
|
{{end}}
|
2020-10-12 19:55:13 +00:00
|
|
|
{{end}}
|
|
|
|
|
{{if .TeamReviewers}}
|
|
|
|
|
<div class="ui divider"></div>
|
|
|
|
|
{{range .TeamReviewers}}
|
|
|
|
|
{{if .Team}}
|
|
|
|
|
<a class="{{if not .CanChange}}ui poping up{{end}} item {{if .Checked}} checked {{end}} {{if not .CanChange}}ban-change{{end}}" href="#" data-id="{{.ItemID}}" data-id-selector="#review_request_team_{{.Team.ID}}" {{if not .CanChange}} data-content="{{$.i18n.Tr "repo.issues.remove_request_review_block"}}"{{end}}>
|
|
|
|
|
<span class="octicon-check {{if not .Checked}}invisible{{end}}">{{svg "octicon-check" 16}}</span>
|
|
|
|
|
<span class="text">
|
|
|
|
|
{{svg "octicon-people" 16 "ml-4 mr-2"}}{{$.Issue.Repo.OwnerName}}/{{.Team.Name}}
|
|
|
|
|
</span>
|
|
|
|
|
</a>
|
|
|
|
|
{{end}}
|
2020-04-06 16:33:34 +00:00
|
|
|
{{end}}
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
<div class="ui assignees list">
|
2020-10-14 12:11:11 +00:00
|
|
|
<span class="no-select item {{if or .OriginalReviews .PullReviewers}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_reviewers"}}</span>
|
2020-04-06 16:33:34 +00:00
|
|
|
<div class="selected">
|
|
|
|
|
{{range .PullReviewers}}
|
2020-11-12 05:55:34 +00:00
|
|
|
<div class="item mb-2">
|
2020-10-12 19:55:13 +00:00
|
|
|
{{if .User}}
|
2020-11-29 06:22:04 +00:00
|
|
|
<a class="muted sidebar-item-link" href="{{.User.HomeLink}}">
|
2020-12-03 18:46:11 +00:00
|
|
|
{{avatar .User 28 "mr-3"}}
|
2020-11-12 05:55:34 +00:00
|
|
|
{{.User.GetDisplayName}}
|
|
|
|
|
</a>
|
2020-10-12 19:55:13 +00:00
|
|
|
{{else if .Team}}
|
|
|
|
|
<span class="text">{{svg "octicon-people" 16 "teamavatar"}}{{$.Issue.Repo.OwnerName}}/{{.Team.Name}}</span>
|
|
|
|
|
{{end}}
|
|
|
|
|
<span class="ui right type-icon text {{if eq .Review.Type 1}}green
|
|
|
|
|
{{- else if eq .Review.Type 2}}grey
|
|
|
|
|
{{- else if eq .Review.Type 3}}red
|
|
|
|
|
{{- else if eq .Review.Type 4}}yellow
|
2020-04-06 16:33:34 +00:00
|
|
|
{{- else}}grey{{end}} right ">
|
|
|
|
|
|
2020-10-12 19:55:13 +00:00
|
|
|
{{if .CanChange}}
|
|
|
|
|
<a href="#" class="ui poping up icon re-request-review {{if .Checked}}checked{{end}}" data-content="{{if .Checked}} {{$.i18n.Tr "repo.issues.remove_request_review"}} {{else}} {{$.i18n.Tr "repo.issues.re_request_review"}} {{end}}" data-issue-id="{{$.Issue.ID}}" data-id="{{.ItemID}}" data-update-url="{{$.RepoLink}}/issues/request_review">
|
2020-11-27 20:55:59 +00:00
|
|
|
{{if .Checked}} {{svg "octicon-trashcan"}} {{else}} {{svg "octicon-sync"}} {{end}}
|
2020-04-06 16:33:34 +00:00
|
|
|
</a>
|
|
|
|
|
{{end}}
|
2020-10-12 19:55:13 +00:00
|
|
|
{{svg (printf "octicon-%s" .Review.Type.Icon)}}
|
2020-04-06 16:33:34 +00:00
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
2020-10-14 12:11:11 +00:00
|
|
|
{{range .OriginalReviews}}
|
|
|
|
|
<div class="item" style="margin-bottom: 10px;">
|
|
|
|
|
<a href="{{$.Repository.OriginalURL}}" class="ui poping up" data-content="{{$.i18n.Tr "repo.migrated_from_fake" $.Repository.GetOriginalURLHostname | Safe }}"><span class="text black "><i class="fa {{MigrationIcon $.Repository.GetOriginalURLHostname}}" aria-hidden="true"></i> {{ .OriginalAuthor }}</span></a>
|
|
|
|
|
<span class="ui right type-icon text {{if eq .Type 1}}green
|
|
|
|
|
{{- else if eq .Type 2}}grey
|
|
|
|
|
{{- else if eq .Type 3}}red
|
|
|
|
|
{{- else if eq .Type 4}}yellow
|
|
|
|
|
{{- else}}grey{{end}} right ">
|
|
|
|
|
{{svg (printf "octicon-%s" .Type.Icon)}}
|
|
|
|
|
</span>
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
2020-04-06 16:33:34 +00:00
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="ui divider"></div>
|
2020-06-17 14:12:06 +00:00
|
|
|
{{end}}
|
2020-04-06 16:33:34 +00:00
|
|
|
|
2020-04-04 05:39:48 +00:00
|
|
|
<div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-label dropdown">
|
2017-03-17 05:57:43 +00:00
|
|
|
<span class="text">
|
|
|
|
|
<strong>{{.i18n.Tr "repo.issues.new.labels"}}</strong>
|
2020-04-04 05:39:48 +00:00
|
|
|
{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
|
2020-09-11 20:19:00 +00:00
|
|
|
{{svg "octicon-gear"}}
|
2020-03-17 16:19:03 +00:00
|
|
|
{{end}}
|
2017-03-17 05:57:43 +00:00
|
|
|
</span>
|
2020-02-11 20:40:47 +00:00
|
|
|
<div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/labels">
|
2020-04-04 05:39:48 +00:00
|
|
|
<div class="header" style="text-transform: none;font-size:16px;">{{.i18n.Tr "repo.issues.new.add_labels_title"}}</div>
|
|
|
|
|
{{if or .Labels .OrgLabels}}
|
|
|
|
|
<div class="ui icon search input">
|
2020-11-09 18:21:47 +00:00
|
|
|
<i class="icon df ac jc">{{svg "octicon-search" 16}}</i>
|
2020-04-04 05:39:48 +00:00
|
|
|
<input type="text" placeholder="{{.i18n.Tr "repo.issues.filter_labels"}}">
|
|
|
|
|
</div>
|
2017-03-17 05:57:43 +00:00
|
|
|
{{end}}
|
2020-04-04 05:39:48 +00:00
|
|
|
<div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_labels"}}</div>
|
|
|
|
|
{{if or .Labels .OrgLabels}}
|
|
|
|
|
{{range .Labels}}
|
2020-09-11 20:19:00 +00:00
|
|
|
<a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon-check {{if not .IsChecked}}invisible{{end}}">{{svg "octicon-check"}}</span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}}
|
2020-05-01 17:58:45 +00:00
|
|
|
{{if .Description }}<br><small class="desc">{{.Description | RenderEmoji}}</small>{{end}}</a>
|
2020-04-04 05:39:48 +00:00
|
|
|
{{end}}
|
|
|
|
|
<div class="ui divider"></div>
|
|
|
|
|
{{range .OrgLabels}}
|
2020-09-11 20:19:00 +00:00
|
|
|
<a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon-check {{if not .IsChecked}}invisible{{end}}">{{svg "octicon-check"}}</span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}}
|
2020-05-01 17:58:45 +00:00
|
|
|
{{if .Description }}<br><small class="desc">{{.Description | RenderEmoji}}</small>{{end}}</a>
|
2020-04-04 05:39:48 +00:00
|
|
|
{{end}}
|
|
|
|
|
{{else}}
|
|
|
|
|
<div class="header" style="text-transform: none;font-size:14px;">{{.i18n.Tr "repo.issues.new.no_items"}}</div>
|
Add Organization Wide Labels (#10814)
* Add organization wide labels
Implement organization wide labels similar to organization wide
webhooks. This lets you create individual labels for organizations that can be used
for all repos under that organization (so being able to reuse the same
label across multiple repos).
This makes it possible for small organizations with many repos to use
labels effectively.
Fixes #7406
* Add migration
* remove comments
* fix tests
* Update options/locale/locale_en-US.ini
Removed unused translation string
* show org labels in issue search label filter
* Use more clear var name
* rename migration after merge from master
* comment typo
* update migration again after rebase with master
* check for orgID <=0 per guillep2k review
* fmt
* Apply suggestions from code review
Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>
* remove unused code
* Make sure RepoID is 0 when searching orgID per code review
* more changes/code review requests
* More descriptive translation var per code review
* func description/delete comment when issue label deleted instead of hiding it
* remove comment
* only use issues in that repo when calculating number of open issues for org label on repo label page
* Add integration test for IssuesSearch API with labels
* remove unused function
* Update models/issue_label.go
Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>
* Use subquery in GetLabelIDsInReposByNames
* Fix tests to use correct orgID
* fix more tests
* IssuesSearch api now uses new BuildLabelNamesIssueIDsCondition. Add a few more tests as well
* update comment for clarity
* Revert previous code change now that we can use the new BuildLabelNamesIssueIDsCondition
* Don't sort repos by date in IssuesSearch API
After much debugging I've found a strange issue where in some cases MySQL will return a different result than other enigines if a query is sorted by a null collumn. For example with our integration test data where we don't set updated_unix in repository fixtures:
SELECT `id`, `owner_id`, `owner_name`, `lower_name`, `name`, `description`, `website`, `original_service_type`, `original_url`, `default_branch`, `num_watches`, `num_stars`, `num_forks`, `num_issues`, `num_closed_issues`, `num_pulls`, `num_closed_pulls`, `num_milestones`, `num_closed_milestones`, `is_private`, `is_empty`, `is_archived`, `is_mirror`, `status`, `is_fork`, `fork_id`, `is_template`, `template_id`, `size`, `is_fsck_enabled`, `close_issues_via_commit_in_any_branch`, `topics`, `avatar`, `created_unix`, `updated_unix` FROM `repository` ORDER BY updated_unix DESC LIMIT 15 OFFSET 45
Returns different results for MySQL than other engines. However, the similar query:
SELECT `id`, `owner_id`, `owner_name`, `lower_name`, `name`, `description`, `website`, `original_service_type`, `original_url`, `default_branch`, `num_watches`, `num_stars`, `num_forks`, `num_issues`, `num_closed_issues`, `num_pulls`, `num_closed_pulls`, `num_milestones`, `num_closed_milestones`, `is_private`, `is_empty`, `is_archived`, `is_mirror`, `status`, `is_fork`, `fork_id`, `is_template`, `template_id`, `size`, `is_fsck_enabled`, `close_issues_via_commit_in_any_branch`, `topics`, `avatar`, `created_unix`, `updated_unix` FROM `repository` ORDER BY updated_unix DESC LIMIT 15 OFFSET 30
Returns the same results.
This causes integration tests to fail on MySQL in certain cases but would never show up in a real installation. Since this API call always returns issues based on the optionally provided repo_priority_id or the issueID itself, there is no change to results by changing the repo sorting method used to get ids earlier in the function.
* linter is back!
* code review
* remove now unused option
* Fix newline at end of files
* more unused code
* update to master
* check for matching ids before query
* Update models/issue_label.go
Co-Authored-By: 6543 <6543@obermui.de>
* Update models/issue_label.go
* update comments
* Update routers/org/setting.go
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
Co-authored-by: 6543 <6543@obermui.de>
2020-04-01 04:14:46 +00:00
|
|
|
{{end}}
|
2017-03-17 05:57:43 +00:00
|
|
|
</div>
|
|
|
|
|
</div>
|
2020-11-17 05:02:41 +00:00
|
|
|
{{template "repo/issue/labels/labels_sidebar" dict "root" $ "ctx" .}}
|
2017-03-17 05:57:43 +00:00
|
|
|
|
|
|
|
|
<div class="ui divider"></div>
|
|
|
|
|
|
2020-04-04 05:39:48 +00:00
|
|
|
<div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-milestone dropdown">
|
2017-03-17 05:57:43 +00:00
|
|
|
<span class="text">
|
|
|
|
|
<strong>{{.i18n.Tr "repo.issues.new.milestone"}}</strong>
|
2020-04-04 05:39:48 +00:00
|
|
|
{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
|
2020-09-11 20:19:00 +00:00
|
|
|
{{svg "octicon-gear"}}
|
2020-03-17 16:19:03 +00:00
|
|
|
{{end}}
|
2017-03-17 05:57:43 +00:00
|
|
|
</span>
|
|
|
|
|
<div class="menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/milestone">
|
2020-04-04 05:39:48 +00:00
|
|
|
<div class="header" style="text-transform: none;font-size:16px;">{{.i18n.Tr "repo.issues.new.add_milestone_title"}}</div>
|
|
|
|
|
{{if or .OpenMilestones .ClosedMilestones}}
|
|
|
|
|
<div class="ui icon search input">
|
2020-11-09 18:21:47 +00:00
|
|
|
<i class="icon df ac jc">{{svg "octicon-search" 16}}</i>
|
2020-04-04 05:39:48 +00:00
|
|
|
<input type="text" placeholder="{{.i18n.Tr "repo.issues.filter_milestones"}}">
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
2017-03-17 05:57:43 +00:00
|
|
|
<div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_milestone"}}</div>
|
2020-04-04 05:39:48 +00:00
|
|
|
{{if and (not .OpenMilestones) (not .ClosedMilestones)}}
|
|
|
|
|
<div class="header" style="text-transform: none;font-size:14px;">
|
|
|
|
|
{{.i18n.Tr "repo.issues.new.no_items"}}
|
2017-03-17 05:57:43 +00:00
|
|
|
</div>
|
2020-04-04 05:39:48 +00:00
|
|
|
{{else}}
|
|
|
|
|
{{if .OpenMilestones}}
|
|
|
|
|
<div class="divider"></div>
|
|
|
|
|
<div class="header">
|
|
|
|
|
{{.i18n.Tr "repo.issues.new.open_milestone"}}
|
|
|
|
|
</div>
|
|
|
|
|
{{range .OpenMilestones}}
|
2020-11-29 06:22:04 +00:00
|
|
|
<a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}">
|
|
|
|
|
{{svg "octicon-milestone" 16 "mr-2"}}
|
|
|
|
|
{{.Name}}
|
|
|
|
|
</a>
|
2020-04-04 05:39:48 +00:00
|
|
|
{{end}}
|
2017-03-17 05:57:43 +00:00
|
|
|
{{end}}
|
2020-04-04 05:39:48 +00:00
|
|
|
{{if .ClosedMilestones}}
|
|
|
|
|
<div class="divider"></div>
|
|
|
|
|
<div class="header">
|
|
|
|
|
{{.i18n.Tr "repo.issues.new.closed_milestone"}}
|
|
|
|
|
</div>
|
|
|
|
|
{{range .ClosedMilestones}}
|
2020-11-29 06:22:04 +00:00
|
|
|
<a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}">
|
|
|
|
|
{{svg "octicon-milestone" 16 "mr-2"}}
|
|
|
|
|
{{.Name}}
|
|
|
|
|
</a>
|
2020-04-04 05:39:48 +00:00
|
|
|
{{end}}
|
2017-03-17 05:57:43 +00:00
|
|
|
{{end}}
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="ui select-milestone list">
|
|
|
|
|
<span class="no-select item {{if .Issue.Milestone}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_milestone"}}</span>
|
|
|
|
|
<div class="selected">
|
|
|
|
|
{{if .Issue.Milestone}}
|
2020-11-29 06:22:04 +00:00
|
|
|
<a class="item muted sidebar-item-link" href="{{.RepoLink}}/milestone/{{.Issue.Milestone.ID}}">
|
|
|
|
|
{{svg "octicon-milestone" 18 "mr-3"}}
|
|
|
|
|
{{.Issue.Milestone.Name}}
|
|
|
|
|
</a>
|
2017-03-17 05:57:43 +00:00
|
|
|
{{end}}
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
|
2020-08-17 03:07:38 +00:00
|
|
|
{{if .IsProjectsEnabled}}
|
|
|
|
|
<div class="ui divider"></div>
|
2020-11-29 06:22:04 +00:00
|
|
|
|
2020-08-17 03:07:38 +00:00
|
|
|
<div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-project dropdown">
|
|
|
|
|
<span class="text">
|
|
|
|
|
<strong>{{.i18n.Tr "repo.issues.new.projects"}}</strong>
|
2020-09-11 20:19:00 +00:00
|
|
|
{{svg "octicon-gear"}}
|
2020-08-17 03:07:38 +00:00
|
|
|
</span>
|
|
|
|
|
<div class="menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/projects">
|
|
|
|
|
<div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_projects"}}</div>
|
|
|
|
|
{{if .OpenProjects}}
|
|
|
|
|
<div class="divider"></div>
|
|
|
|
|
<div class="header">
|
|
|
|
|
{{.i18n.Tr "repo.issues.new.open_projects"}}
|
|
|
|
|
</div>
|
|
|
|
|
{{range .OpenProjects}}
|
2020-11-29 06:22:04 +00:00
|
|
|
<a class="item muted sidebar-item-link" data-id="{{.ID}}" data-href="{{$.RepoLink}}/projects/{{.ID}}">
|
|
|
|
|
{{svg "octicon-project" 18 "mr-3"}}
|
|
|
|
|
{{.Title}}
|
|
|
|
|
</a>
|
2020-08-17 03:07:38 +00:00
|
|
|
{{end}}
|
|
|
|
|
{{end}}
|
|
|
|
|
{{if .ClosedProjects}}
|
|
|
|
|
<div class="divider"></div>
|
|
|
|
|
<div class="header">
|
|
|
|
|
{{.i18n.Tr "repo.issues.new.closed_projects"}}
|
|
|
|
|
</div>
|
|
|
|
|
{{range .ClosedProjects}}
|
2020-11-29 06:22:04 +00:00
|
|
|
<a class="item muted sidebar-item-link" data-id="{{.ID}}" data-href="{{$.RepoLink}}/projects/{{.ID}}">
|
|
|
|
|
{{svg "octicon-project" 18 "mr-3"}}
|
|
|
|
|
{{.Title}}
|
|
|
|
|
</a>
|
2020-08-17 03:07:38 +00:00
|
|
|
{{end}}
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="ui select-project list">
|
|
|
|
|
<span class="no-select item {{if .Issue.ProjectID}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_projects"}}</span>
|
|
|
|
|
<div class="selected">
|
|
|
|
|
{{if .Issue.ProjectID}}
|
2020-11-29 06:22:04 +00:00
|
|
|
<a class="item muted sidebar-item-link" href="{{.RepoLink}}/projects/{{.Issue.ProjectID}}">
|
|
|
|
|
{{svg "octicon-project" 18 "mr-3"}}
|
|
|
|
|
{{.Issue.Project.Title}}
|
|
|
|
|
</a>
|
2020-08-17 03:07:38 +00:00
|
|
|
{{end}}
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
|
2017-03-17 05:57:43 +00:00
|
|
|
<div class="ui divider"></div>
|
|
|
|
|
|
|
|
|
|
<input id="assignee_id" name="assignee_id" type="hidden" value="{{.assignee_id}}">
|
2020-04-04 05:39:48 +00:00
|
|
|
<div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-assignees-modify dropdown">
|
2017-03-17 05:57:43 +00:00
|
|
|
<span class="text">
|
2018-05-09 16:29:04 +00:00
|
|
|
<strong>{{.i18n.Tr "repo.issues.new.assignees"}}</strong>
|
2020-04-04 05:39:48 +00:00
|
|
|
{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
|
2020-09-11 20:19:00 +00:00
|
|
|
{{svg "octicon-gear"}}
|
2020-03-17 16:19:03 +00:00
|
|
|
{{end}}
|
2017-03-17 05:57:43 +00:00
|
|
|
</span>
|
2020-09-02 16:55:13 +00:00
|
|
|
<div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/assignee">
|
2020-04-04 05:39:48 +00:00
|
|
|
<div class="header" style="text-transform: none;font-size:16px;">{{.i18n.Tr "repo.issues.new.add_assignees_title"}}</div>
|
|
|
|
|
<div class="ui icon search input">
|
2020-11-09 18:21:47 +00:00
|
|
|
<i class="icon df ac jc">{{svg "octicon-search" 16}}</i>
|
2020-04-04 05:39:48 +00:00
|
|
|
<input type="text" placeholder="{{.i18n.Tr "repo.issues.filter_assignees"}}">
|
|
|
|
|
</div>
|
2018-05-09 16:29:04 +00:00
|
|
|
<div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_assignees"}}</div>
|
2017-03-17 05:57:43 +00:00
|
|
|
{{range .Assignees}}
|
2018-05-09 16:29:04 +00:00
|
|
|
|
|
|
|
|
{{$AssigneeID := .ID}}
|
2020-11-12 05:55:34 +00:00
|
|
|
<a class="item{{range $.Issue.Assignees}}{{if eq .ID $AssigneeID}} checked{{end}}{{end}}" href="#" data-id="{{.ID}}" data-id-selector="#assignee_{{.ID}}">
|
2020-02-11 17:02:41 +00:00
|
|
|
{{$checked := false}}
|
|
|
|
|
{{range $.Issue.Assignees}}
|
|
|
|
|
{{if eq .ID $AssigneeID}}
|
|
|
|
|
{{$checked = true}}
|
|
|
|
|
{{end}}
|
2018-05-09 16:29:04 +00:00
|
|
|
{{end}}
|
2020-09-11 20:19:00 +00:00
|
|
|
<span class="octicon-check {{if not $checked}}invisible{{end}}">{{svg "octicon-check"}}</span>
|
2018-05-09 16:29:04 +00:00
|
|
|
<span class="text">
|
2020-12-03 18:46:11 +00:00
|
|
|
{{avatar . 28 "mr-3"}}
|
2020-11-12 05:55:34 +00:00
|
|
|
{{.GetDisplayName}}
|
2018-05-09 16:29:04 +00:00
|
|
|
</span>
|
|
|
|
|
</a>
|
2017-03-17 05:57:43 +00:00
|
|
|
{{end}}
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
2018-05-09 16:29:04 +00:00
|
|
|
<div class="ui assignees list">
|
|
|
|
|
<span class="no-select item {{if .Issue.Assignees}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_assignees"}}</span>
|
2017-03-17 05:57:43 +00:00
|
|
|
<div class="selected">
|
2018-05-09 16:29:04 +00:00
|
|
|
{{range .Issue.Assignees}}
|
2020-11-29 06:22:04 +00:00
|
|
|
<div class="item">
|
|
|
|
|
<a class="muted sidebar-item-link" href="{{$.RepoLink}}/{{if $.Issue.IsPull}}pulls{{else}}issues{{end}}?assignee={{.ID}}">
|
2020-12-03 18:46:11 +00:00
|
|
|
{{avatar . 28 "mr-3"}}
|
2020-11-12 05:55:34 +00:00
|
|
|
{{.GetDisplayName}}
|
|
|
|
|
</a>
|
2018-05-09 16:29:04 +00:00
|
|
|
</div>
|
2017-03-17 05:57:43 +00:00
|
|
|
{{end}}
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
<div class="ui divider"></div>
|
|
|
|
|
|
2020-12-08 03:20:12 +00:00
|
|
|
{{if .Participants}}
|
2017-03-17 05:57:43 +00:00
|
|
|
<span class="text"><strong>{{.i18n.Tr "repo.issues.num_participants" .NumParticipants}}</strong></span>
|
2020-12-08 03:20:12 +00:00
|
|
|
<div class="ui list df fw">
|
2017-03-17 05:57:43 +00:00
|
|
|
{{range .Participants}}
|
2020-12-08 03:20:12 +00:00
|
|
|
<a class="ui poping up" {{if gt .ID 0}}href="{{.HomeLink}}"{{end}} data-content="{{.GetDisplayName}}" data-position="top center" data-variation="small inverted">
|
|
|
|
|
{{avatar . 28 "my-1 mr-2"}}
|
2017-03-17 05:57:43 +00:00
|
|
|
</a>
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
2020-12-08 03:20:12 +00:00
|
|
|
{{end}}
|
2017-03-29 23:31:47 +00:00
|
|
|
|
2019-01-23 18:58:38 +00:00
|
|
|
{{if and $.IssueWatch (not .Repository.IsArchived)}}
|
2017-09-12 06:48:13 +00:00
|
|
|
<div class="ui divider"></div>
|
2017-03-29 23:31:47 +00:00
|
|
|
|
2017-09-12 06:48:13 +00:00
|
|
|
<div class="ui watching">
|
|
|
|
|
<span class="text"><strong>{{.i18n.Tr "notification.notifications"}}</strong></span>
|
2020-11-01 20:04:26 +00:00
|
|
|
<div class="mt-3">
|
2017-09-12 06:48:13 +00:00
|
|
|
<form method="POST" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/watch">
|
|
|
|
|
<input type="hidden" name="watch" value="{{if $.IssueWatch.IsWatching}}0{{else}}1{{end}}" />
|
|
|
|
|
{{$.CsrfTokenHtml}}
|
|
|
|
|
<button class="fluid ui button">
|
|
|
|
|
{{if $.IssueWatch.IsWatching}}
|
2020-09-11 20:19:00 +00:00
|
|
|
{{svg "octicon-mute"}}
|
2017-09-12 06:48:13 +00:00
|
|
|
{{.i18n.Tr "repo.issues.unsubscribe"}}
|
|
|
|
|
{{else}}
|
2020-09-11 20:19:00 +00:00
|
|
|
{{svg "octicon-unmute"}}
|
2017-09-12 06:48:13 +00:00
|
|
|
{{.i18n.Tr "repo.issues.subscribe"}}
|
|
|
|
|
{{end}}
|
|
|
|
|
</button>
|
|
|
|
|
</form>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
{{if .Repository.IsTimetrackerEnabled }}
|
2019-01-23 18:58:38 +00:00
|
|
|
{{if and .CanUseTimetracker (not .Repository.IsArchived)}}
|
2017-09-12 06:48:13 +00:00
|
|
|
<div class="ui divider"></div>
|
|
|
|
|
<div class="ui timetrack">
|
|
|
|
|
<span class="text"><strong>{{.i18n.Tr "repo.issues.tracker"}}</strong></span>
|
2020-12-08 03:20:12 +00:00
|
|
|
<div class="mt-3">
|
2017-09-12 06:48:13 +00:00
|
|
|
<form method="POST" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/times/stopwatch/toggle" id="toggle_stopwatch_form">
|
|
|
|
|
{{$.CsrfTokenHtml}}
|
|
|
|
|
</form>
|
|
|
|
|
<form method="POST" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/times/stopwatch/cancel" id="cancel_stopwatch_form">
|
|
|
|
|
{{$.CsrfTokenHtml}}
|
|
|
|
|
</form>
|
|
|
|
|
{{if $.IsStopwatchRunning}}
|
2020-12-10 16:19:18 +00:00
|
|
|
<div class="ui buttons fluid">
|
|
|
|
|
<button class="ui button issue-stop-time">{{.i18n.Tr "repo.issues.stop_tracking"}}</button>
|
|
|
|
|
<button class="ui negative button issue-cancel-time">{{.i18n.Tr "repo.issues.cancel_tracking"}}</button>
|
2017-09-12 06:48:13 +00:00
|
|
|
</div>
|
2017-03-29 23:31:47 +00:00
|
|
|
{{else}}
|
2017-09-12 06:48:13 +00:00
|
|
|
{{if .HasUserStopwatch}}
|
|
|
|
|
<div class="ui warning message">
|
|
|
|
|
{{.i18n.Tr "repo.issues.tracking_already_started" .OtherStopwatchURL | Safe}}
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
2020-12-10 16:19:18 +00:00
|
|
|
<div class="ui buttons two fluid">
|
|
|
|
|
<button class="ui button poping up issue-start-time" data-content='{{.i18n.Tr "repo.issues.start_tracking"}}' data-position="top center" data-variation="small inverted">{{.i18n.Tr "repo.issues.start_tracking_short"}}</button>
|
2017-09-12 06:48:13 +00:00
|
|
|
<div class="ui mini modal">
|
|
|
|
|
<div class="header">{{.i18n.Tr "repo.issues.add_time"}}</div>
|
|
|
|
|
<div class="content">
|
|
|
|
|
<form method="POST" id="add_time_manual_form" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/times/add" class="ui action input fluid">
|
|
|
|
|
{{$.CsrfTokenHtml}}
|
|
|
|
|
<input placeholder='{{.i18n.Tr "repo.issues.add_time_hours"}}' type="number" name="hours">
|
|
|
|
|
<input placeholder='{{.i18n.Tr "repo.issues.add_time_minutes"}}' type="number" name="minutes" class="ui compact">
|
|
|
|
|
</form>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="actions">
|
|
|
|
|
<div class="ui green approve button">{{.i18n.Tr "repo.issues.add_time_short"}}</div>
|
|
|
|
|
<div class="ui red cancel button">{{.i18n.Tr "repo.issues.add_time_cancel"}}</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
2020-12-10 16:19:18 +00:00
|
|
|
<button class="ui button green poping up issue-add-time" data-content='{{.i18n.Tr "repo.issues.add_time"}}' data-position="top center" data-variation="small inverted">{{.i18n.Tr "repo.issues.add_time_short"}}</button>
|
2017-09-12 06:48:13 +00:00
|
|
|
</div>
|
2017-03-29 23:31:47 +00:00
|
|
|
{{end}}
|
2017-09-12 06:48:13 +00:00
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
{{if gt (len .WorkingUsers) 0}}
|
|
|
|
|
<div class="ui divider"></div>
|
2020-12-08 03:20:12 +00:00
|
|
|
<div class="ui comments">
|
2018-04-29 05:58:47 +00:00
|
|
|
<span class="text"><strong>{{.i18n.Tr "repo.issues.time_spent_from_all_authors" ($.Issue.TotalTrackedTime | Sec2Time) | Safe}}</strong></span>
|
2017-09-12 06:48:13 +00:00
|
|
|
<div>
|
|
|
|
|
{{range $user, $trackedtime := .WorkingUsers}}
|
2020-12-08 03:20:12 +00:00
|
|
|
<div class="comment mt-3">
|
2017-09-12 06:48:13 +00:00
|
|
|
<a class="avatar">
|
2020-12-03 18:46:11 +00:00
|
|
|
{{avatar $user}}
|
2017-09-12 06:48:13 +00:00
|
|
|
</a>
|
|
|
|
|
<div class="content">
|
|
|
|
|
<a class="author">{{$user.DisplayName}}</a>
|
|
|
|
|
<div class="text">
|
|
|
|
|
{{$trackedtime}}
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
2017-04-29 05:52:25 +00:00
|
|
|
{{end}}
|
2018-05-01 19:05:28 +00:00
|
|
|
|
|
|
|
|
<div class="ui divider"></div>
|
|
|
|
|
<span class="text"><strong>{{.i18n.Tr "repo.issues.due_date"}}</strong></span>
|
2018-07-16 12:43:00 +00:00
|
|
|
<div class="ui form" id="deadline-loader">
|
|
|
|
|
<div class="ui negative message" id="deadline-err-invalid-date" style="display: none;">
|
|
|
|
|
<i class="close icon"></i>
|
|
|
|
|
{{.i18n.Tr "repo.issues.due_date_invalid"}}
|
|
|
|
|
</div>
|
|
|
|
|
{{if ne .Issue.DeadlineUnix 0}}
|
|
|
|
|
<p>
|
2020-09-11 20:19:00 +00:00
|
|
|
{{svg "octicon-calendar"}}
|
2020-06-05 22:51:10 +00:00
|
|
|
{{.Issue.DeadlineUnix.FormatDate}}
|
2018-07-16 12:43:00 +00:00
|
|
|
{{if .Issue.IsOverdue}}
|
|
|
|
|
<span style="color: red;">{{.i18n.Tr "repo.issues.due_date_overdue"}}</span>
|
2018-05-01 19:05:28 +00:00
|
|
|
{{end}}
|
2020-04-04 05:39:48 +00:00
|
|
|
{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
|
2018-07-16 12:43:00 +00:00
|
|
|
<br/>
|
2020-12-10 16:19:18 +00:00
|
|
|
<a class="issue-due-edit"><i class="edit icon"></i>{{$.i18n.Tr "repo.issues.due_date_form_edit"}}</a> -
|
|
|
|
|
<a class="issue-due-remove"><i class="remove icon"></i>{{$.i18n.Tr "repo.issues.due_date_form_remove"}}</a>
|
2018-07-16 12:43:00 +00:00
|
|
|
{{end}}
|
|
|
|
|
</p>
|
|
|
|
|
{{else}}
|
|
|
|
|
<p><i>{{.i18n.Tr "repo.issues.due_date_not_set"}}</i></p>
|
|
|
|
|
{{end}}
|
2018-05-01 19:05:28 +00:00
|
|
|
|
2020-04-04 05:39:48 +00:00
|
|
|
{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
|
2018-07-16 12:43:00 +00:00
|
|
|
<div {{if ne .Issue.DeadlineUnix 0}} style="display: none;"{{end}} id="deadlineForm">
|
2020-12-10 16:19:18 +00:00
|
|
|
<form class="ui fluid action input issue-due-form" action="{{AppSubUrl}}/api/v1/repos/{{.Repository.Owner.Name}}/{{.Repository.Name}}/issues/{{.Issue.Index}}" method="post" id="update-issue-deadline-form">
|
2018-07-16 12:43:00 +00:00
|
|
|
{{$.CsrfTokenHtml}}
|
|
|
|
|
<input required placeholder="{{.i18n.Tr "repo.issues.due_date_form"}}" {{if gt .Issue.DeadlineUnix 0}}value="{{.Issue.DeadlineUnix.Format "2006-01-02"}}"{{end}} type="date" name="deadlineDate" id="deadlineDate">
|
|
|
|
|
<button class="ui green icon button">
|
|
|
|
|
{{if ne .Issue.DeadlineUnix 0}}
|
|
|
|
|
<i class="edit icon"></i>
|
|
|
|
|
{{else}}
|
|
|
|
|
<i class="plus icon"></i>
|
|
|
|
|
{{end}}
|
|
|
|
|
</button>
|
|
|
|
|
</form>
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
2018-07-17 21:23:58 +00:00
|
|
|
|
|
|
|
|
{{if .Repository.IsDependenciesEnabled}}
|
|
|
|
|
<div class="ui divider"></div>
|
|
|
|
|
|
|
|
|
|
<div class="ui depending">
|
2018-09-07 02:32:46 +00:00
|
|
|
{{if (and (not .BlockedByDependencies) (not .BlockingDependencies))}}
|
|
|
|
|
<span class="text"><strong>{{.i18n.Tr "repo.issues.dependency.title"}}</strong></span>
|
|
|
|
|
<br>
|
2020-11-10 18:28:07 +00:00
|
|
|
<p>
|
|
|
|
|
{{if .Issue.IsPull}}
|
2018-09-07 02:32:46 +00:00
|
|
|
{{.i18n.Tr "repo.issues.dependency.pr_no_dependencies"}}
|
|
|
|
|
{{else}}
|
|
|
|
|
{{.i18n.Tr "repo.issues.dependency.issue_no_dependencies"}}
|
2020-11-10 18:28:07 +00:00
|
|
|
{{end}}
|
|
|
|
|
</p>
|
2018-09-07 02:32:46 +00:00
|
|
|
{{end}}
|
|
|
|
|
|
|
|
|
|
{{if .BlockingDependencies}}
|
2020-11-10 18:28:07 +00:00
|
|
|
<span class="text poping up" data-content="{{if .Issue.IsPull}}{{.i18n.Tr "repo.issues.dependency.pr_close_blocks"}}{{else}}{{.i18n.Tr "repo.issues.dependency.issue_close_blocks"}}{{end}}">
|
|
|
|
|
<strong>{{.i18n.Tr "repo.issues.dependency.blocks_short"}}</strong>
|
2018-07-17 21:23:58 +00:00
|
|
|
</span>
|
|
|
|
|
<div class="ui relaxed divided list">
|
2018-09-07 02:32:46 +00:00
|
|
|
{{range .BlockingDependencies}}
|
2020-11-14 01:16:46 +00:00
|
|
|
<div class="item dependency{{if .Issue.IsClosed}} is-closed{{end}} df ac sb">
|
2020-11-10 18:28:07 +00:00
|
|
|
<div class="item-left df jc fc f1">
|
|
|
|
|
<a class="title" href="{{.Repository.Link}}/issues/{{.Issue.Index}}">
|
|
|
|
|
#{{.Issue.Index}} {{.Issue.Title | RenderEmoji}}
|
|
|
|
|
</a>
|
|
|
|
|
<div class="text small">
|
|
|
|
|
{{.Repository.OwnerName}}/{{.Repository.Name}}
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="item-right df ac">
|
2019-01-23 18:58:38 +00:00
|
|
|
{{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}}
|
2020-11-10 18:28:07 +00:00
|
|
|
<a class="delete-dependency-button poping up ci" onclick="window.deleteDependencyModal({{.Issue.ID}}, 'blocking');"
|
|
|
|
|
data-content="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted="">
|
|
|
|
|
{{svg "octicon-trashcan" 16}}
|
2018-07-17 21:23:58 +00:00
|
|
|
</a>
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
|
2018-09-07 02:32:46 +00:00
|
|
|
{{if .BlockedByDependencies}}
|
2020-11-10 18:28:07 +00:00
|
|
|
<span class="text poping up" data-content="{{if .Issue.IsPull}}{{.i18n.Tr "repo.issues.dependency.pr_closing_blockedby"}}{{else}}{{.i18n.Tr "repo.issues.dependency.issue_closing_blockedby"}}{{end}}">
|
|
|
|
|
<strong>{{.i18n.Tr "repo.issues.dependency.blocked_by_short"}}</strong>
|
2018-07-17 21:23:58 +00:00
|
|
|
</span>
|
|
|
|
|
<div class="ui relaxed divided list">
|
2018-09-07 02:32:46 +00:00
|
|
|
{{range .BlockedByDependencies}}
|
2020-11-14 01:16:46 +00:00
|
|
|
<div class="item dependency{{if .Issue.IsClosed}} is-closed{{end}} df ac sb">
|
2020-11-10 18:28:07 +00:00
|
|
|
<div class="item-left df jc fc f1">
|
|
|
|
|
<a class="title" href="{{.Repository.Link}}/issues/{{.Issue.Index}}">
|
|
|
|
|
#{{.Issue.Index}} {{.Issue.Title | RenderEmoji}}
|
|
|
|
|
</a>
|
|
|
|
|
<div class="text small">
|
|
|
|
|
{{.Repository.OwnerName}}/{{.Repository.Name}}
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="item-right df ac">
|
Allow cross-repository dependencies on issues (#7901)
* in progress changes for #7405, added ability to add cross-repo dependencies
* removed unused repolink var
* fixed query that was breaking ci tests; fixed check in issue dependency add so that the id of the issue and dependency is checked rather than the indexes
* reverted removal of string in local files becasue these are done via crowdin, not updated manually
* removed 'Select("issue.*")' from getBlockedByDependencies and getBlockingDependencies based on comments in PR review
* changed getBlockedByDependencies and getBlockingDependencies to use a more xorm-like query, also updated the sidebar as a result
* simplified the getBlockingDependencies and getBlockedByDependencies methods; changed the sidebar to show the dependencies in a different format where you can see the name of the repository
* made some changes to the issue view in the dependencies (issue name on top, repo full name on separate line). Change view of issue in the dependency search results (also showing the full repo name on separate line)
* replace call to FindUserAccessibleRepoIDs with SearchRepositoryByName. The former was hardcoded to use isPrivate = false on the repo search, but this code needed it to be true. The SearchRepositoryByName method is used more in the code including on the user's dashboard
* some more tweaks to the layout of the issues when showing dependencies and in the search box when you add new dependencies
* added Name to the RepositoryMeta struct
* updated swagger doc
* fixed total count for link header on SearchIssues
* fixed indentation
* fixed aligment of remove icon on dependencies in issue sidebar
* removed unnecessary nil check (unnecessary because issue.loadRepo is called prior to this block)
* reverting .css change, somehow missed or forgot that less is used
* updated less file and generated css; updated sidebar template with styles to line up delete and issue index
* added ordering to the blocked by/depends on queries
* fixed sorting in issue dependency search and the depends on/blocks views to show issues from the current repo first, then by created date descending; added a "all cross repository dependencies" setting to allow this feature to be turned off, if turned off, the issue dependency search will work the way it did before (restricted to the current repository)
* re-applied my swagger changes after merge
* fixed split string condition in issue search
* changed ALLOW_CROSS_REPOSITORY_DEPENDENCIES description to sound more global than just the issue dependency search; returning 400 in the cross repo issue search api method if not enabled; fixed bug where the issue count did not respect the state parameter
* when adding a dependency to an issue, added a check to make sure the issue and dependency are in the same repo if cross repo dependencies is not enabled
* updated sortIssuesSession call in PullRequests, another commit moved this method from pull.go to pull_list.go so I had to re-apply my change here
* fixed incorrect setting of user id parameter in search repos call
2019-10-31 05:06:10 +00:00
|
|
|
{{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}}
|
2020-11-10 18:28:07 +00:00
|
|
|
<a class="delete-dependency-button poping up ci" onclick="window.deleteDependencyModal({{.Issue.ID}}, 'blockedBy');"
|
|
|
|
|
data-content="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted="">
|
|
|
|
|
{{svg "octicon-trashcan" 16}}
|
2018-07-17 21:23:58 +00:00
|
|
|
</a>
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
|
2019-01-23 18:58:38 +00:00
|
|
|
{{if and .CanCreateIssueDependencies (not .Repository.IsArchived)}}
|
2018-07-17 21:23:58 +00:00
|
|
|
<div>
|
|
|
|
|
<form method="POST" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/dependency/add" id="addDependencyForm">
|
|
|
|
|
{{$.CsrfTokenHtml}}
|
|
|
|
|
<div class="ui fluid action input">
|
2019-05-12 11:10:12 +00:00
|
|
|
<div class="ui search selection dropdown" id="new-dependency-drop-list" data-issue-id="{{.Issue.ID}}">
|
2018-07-17 21:23:58 +00:00
|
|
|
<input name="newDependency" type="hidden">
|
2020-10-31 22:15:11 +00:00
|
|
|
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
|
2018-07-17 21:23:58 +00:00
|
|
|
<input type="text" class="search">
|
|
|
|
|
<div class="default text">{{.i18n.Tr "repo.issues.dependency.add"}}</div>
|
|
|
|
|
</div>
|
|
|
|
|
<button class="ui green icon button">
|
|
|
|
|
<i class="plus icon"></i>
|
|
|
|
|
</button>
|
|
|
|
|
</div>
|
|
|
|
|
</form>
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
2019-02-18 20:55:04 +00:00
|
|
|
|
2019-06-29 09:18:49 +00:00
|
|
|
{{ if and .IsRepoAdmin (not .Repository.IsArchived) }}
|
2019-02-18 20:55:04 +00:00
|
|
|
<div class="ui divider"></div>
|
|
|
|
|
<div class="ui watching">
|
2021-01-19 03:02:47 +00:00
|
|
|
<button class="fluid ui show-modal button {{if .Issue.IsLocked }} negative {{ end }}" data-modal="#lock">
|
|
|
|
|
{{if .Issue.IsLocked}}
|
|
|
|
|
{{svg "octicon-key"}}
|
|
|
|
|
{{.i18n.Tr "repo.issues.unlock"}}
|
|
|
|
|
{{else}}
|
|
|
|
|
{{svg "octicon-lock"}}
|
|
|
|
|
{{.i18n.Tr "repo.issues.lock"}}
|
|
|
|
|
{{end}}
|
|
|
|
|
</button>
|
2019-02-18 20:55:04 +00:00
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div class="ui tiny modal" id="lock">
|
|
|
|
|
<div class="header">
|
|
|
|
|
{{ if .Issue.IsLocked }}
|
|
|
|
|
{{.i18n.Tr "repo.issues.unlock.title"}}
|
|
|
|
|
{{ else }}
|
|
|
|
|
{{.i18n.Tr "repo.issues.lock.title"}}
|
|
|
|
|
{{ end }}
|
|
|
|
|
</div>
|
|
|
|
|
<div class="content">
|
|
|
|
|
<div class="ui warning message text left">
|
|
|
|
|
{{ if .Issue.IsLocked }}
|
|
|
|
|
{{.i18n.Tr "repo.issues.unlock.notice_1"}}<br>
|
|
|
|
|
{{.i18n.Tr "repo.issues.unlock.notice_2"}}<br>
|
|
|
|
|
{{ else }}
|
|
|
|
|
{{.i18n.Tr "repo.issues.lock.notice_1"}}<br>
|
|
|
|
|
{{.i18n.Tr "repo.issues.lock.notice_2"}}<br>
|
|
|
|
|
{{.i18n.Tr "repo.issues.lock.notice_3"}}<br>
|
|
|
|
|
{{ end }}
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
<form class="ui form" action="{{$.RepoLink}}/issues/{{.Issue.Index}}{{ if .Issue.IsLocked }}/unlock{{ else }}/lock{{ end }}"
|
|
|
|
|
method="post">
|
|
|
|
|
{{.CsrfTokenHtml}}
|
|
|
|
|
|
|
|
|
|
{{ if not .Issue.IsLocked }}
|
|
|
|
|
<div class="field">
|
|
|
|
|
<strong> {{ .i18n.Tr "repo.issues.lock.reason" }} </strong>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
<div class="field">
|
|
|
|
|
<div class="ui fluid dropdown selection" tabindex="0">
|
|
|
|
|
|
|
|
|
|
<select name="reason">
|
|
|
|
|
<option value=""> </option>
|
|
|
|
|
{{range .LockReasons}}
|
|
|
|
|
<option value="{{.}}">{{.}}</option>
|
|
|
|
|
{{end}}
|
|
|
|
|
</select>
|
2020-10-31 22:15:11 +00:00
|
|
|
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
|
2019-02-18 20:55:04 +00:00
|
|
|
|
|
|
|
|
<div class="default text"> </div>
|
|
|
|
|
|
|
|
|
|
<div class="menu transition hidden" tabindex="-1" style="display: block !important;">
|
|
|
|
|
{{range .LockReasons}}
|
|
|
|
|
<div class="item" data-value="{{.}}">{{.}}</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
{{ end }}
|
|
|
|
|
|
|
|
|
|
<div class="text right actions">
|
|
|
|
|
<div class="ui cancel button">{{.i18n.Tr "settings.cancel"}}</div>
|
|
|
|
|
<button class="ui red button">
|
|
|
|
|
{{ if .Issue.IsLocked }}
|
|
|
|
|
{{.i18n.Tr "repo.issues.unlock_confirm"}}
|
|
|
|
|
{{ else }}
|
|
|
|
|
{{.i18n.Tr "repo.issues.lock_confirm"}}
|
|
|
|
|
{{ end }}
|
|
|
|
|
</button>
|
|
|
|
|
</div>
|
|
|
|
|
</form>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
{{ end }}
|
|
|
|
|
|
2017-03-17 05:57:43 +00:00
|
|
|
</div>
|
|
|
|
|
</div>
|
2019-01-23 18:58:38 +00:00
|
|
|
{{if and .CanCreateIssueDependencies (not .Repository.IsArchived)}}
|
2018-11-25 17:25:55 +00:00
|
|
|
<input type="hidden" id="repolink" value="{{$.RepoRelPath}}">
|
Allow cross-repository dependencies on issues (#7901)
* in progress changes for #7405, added ability to add cross-repo dependencies
* removed unused repolink var
* fixed query that was breaking ci tests; fixed check in issue dependency add so that the id of the issue and dependency is checked rather than the indexes
* reverted removal of string in local files becasue these are done via crowdin, not updated manually
* removed 'Select("issue.*")' from getBlockedByDependencies and getBlockingDependencies based on comments in PR review
* changed getBlockedByDependencies and getBlockingDependencies to use a more xorm-like query, also updated the sidebar as a result
* simplified the getBlockingDependencies and getBlockedByDependencies methods; changed the sidebar to show the dependencies in a different format where you can see the name of the repository
* made some changes to the issue view in the dependencies (issue name on top, repo full name on separate line). Change view of issue in the dependency search results (also showing the full repo name on separate line)
* replace call to FindUserAccessibleRepoIDs with SearchRepositoryByName. The former was hardcoded to use isPrivate = false on the repo search, but this code needed it to be true. The SearchRepositoryByName method is used more in the code including on the user's dashboard
* some more tweaks to the layout of the issues when showing dependencies and in the search box when you add new dependencies
* added Name to the RepositoryMeta struct
* updated swagger doc
* fixed total count for link header on SearchIssues
* fixed indentation
* fixed aligment of remove icon on dependencies in issue sidebar
* removed unnecessary nil check (unnecessary because issue.loadRepo is called prior to this block)
* reverting .css change, somehow missed or forgot that less is used
* updated less file and generated css; updated sidebar template with styles to line up delete and issue index
* added ordering to the blocked by/depends on queries
* fixed sorting in issue dependency search and the depends on/blocks views to show issues from the current repo first, then by created date descending; added a "all cross repository dependencies" setting to allow this feature to be turned off, if turned off, the issue dependency search will work the way it did before (restricted to the current repository)
* re-applied my swagger changes after merge
* fixed split string condition in issue search
* changed ALLOW_CROSS_REPOSITORY_DEPENDENCIES description to sound more global than just the issue dependency search; returning 400 in the cross repo issue search api method if not enabled; fixed bug where the issue count did not respect the state parameter
* when adding a dependency to an issue, added a check to make sure the issue and dependency are in the same repo if cross repo dependencies is not enabled
* updated sortIssuesSession call in PullRequests, another commit moved this method from pull.go to pull_list.go so I had to re-apply my change here
* fixed incorrect setting of user id parameter in search repos call
2019-10-31 05:06:10 +00:00
|
|
|
<input type="hidden" id="repoId" value="{{.Repository.ID}}">
|
|
|
|
|
<input type="hidden" id="crossRepoSearch" value="{{.AllowCrossRepositoryDependencies}}">
|
2020-01-19 06:43:38 +00:00
|
|
|
<input type="hidden" id="type" value="{{.IssueType}}">
|
2018-07-17 21:23:58 +00:00
|
|
|
<!-- I know, there is probably a better way to do this -->
|
|
|
|
|
<input type="hidden" id="issueIndex" value="{{.Issue.Index}}"/>
|
|
|
|
|
|
|
|
|
|
<div class="ui basic modal remove-dependency">
|
|
|
|
|
<div class="ui icon header">
|
2020-10-21 21:07:33 +00:00
|
|
|
{{svg "octicon-trashcan"}}
|
2018-07-17 21:23:58 +00:00
|
|
|
{{.i18n.Tr "repo.issues.dependency.remove_header"}}
|
|
|
|
|
</div>
|
|
|
|
|
<div class="content">
|
|
|
|
|
<form method="POST" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/dependency/delete" id="removeDependencyForm">
|
|
|
|
|
{{$.CsrfTokenHtml}}
|
|
|
|
|
<input type="hidden" value="" name="removeDependencyID" id="removeDependencyID"/>
|
|
|
|
|
<input type="hidden" value="" name="dependencyType" id="dependencyType"/>
|
|
|
|
|
</form>
|
|
|
|
|
<p>{{if .Issue.IsPull}}
|
|
|
|
|
{{.i18n.Tr "repo.issues.dependency.pr_remove_text"}}
|
|
|
|
|
{{else}}
|
|
|
|
|
{{.i18n.Tr "repo.issues.dependency.issue_remove_text"}}
|
|
|
|
|
{{end}}</p>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="actions">
|
|
|
|
|
<div class="ui basic red cancel inverted button">
|
|
|
|
|
<i class="remove icon"></i>
|
|
|
|
|
{{.i18n.Tr "repo.issues.dependency.cancel"}}
|
|
|
|
|
</div>
|
|
|
|
|
<div class="ui basic green ok inverted button">
|
|
|
|
|
<i class="checkmark icon"></i>
|
|
|
|
|
{{.i18n.Tr "repo.issues.dependency.remove"}}
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
{{end}}
|
|
|
|
|
{{end}}
|
