mirror of
https://github.com/go-gitea/gitea.git
synced 2024-11-28 03:33:08 +08:00
fix conflicts
This commit is contained in:
parent
418a13c27b
commit
941f7fdf80
|
@ -223,6 +223,8 @@ function selectItem(select_id, input_id) {
|
||||||
icon = svg('octicon-project', 18, 'tw-mr-2');
|
icon = svg('octicon-project', 18, 'tw-mr-2');
|
||||||
} else if (input_id === '#assignee_id') {
|
} else if (input_id === '#assignee_id') {
|
||||||
icon = `<img class="ui avatar image tw-mr-2" alt="avatar" src=${$(this).data('avatar')}>`;
|
icon = `<img class="ui avatar image tw-mr-2" alt="avatar" src=${$(this).data('avatar')}>`;
|
||||||
|
} else if (input_id === '#reviewer_id') {
|
||||||
|
icon = `<img class="ui avatar image tw-mr-2" alt="avatar" src=${$(this).data('avatar')}>`;
|
||||||
}
|
}
|
||||||
|
|
||||||
$list.find('.selected').html(`
|
$list.find('.selected').html(`
|
||||||
|
@ -265,10 +267,12 @@ export function initRepoIssueSidebar() {
|
||||||
initListSubmits('select-label', 'labels');
|
initListSubmits('select-label', 'labels');
|
||||||
initListSubmits('select-assignees', 'assignees');
|
initListSubmits('select-assignees', 'assignees');
|
||||||
initListSubmits('select-assignees-modify', 'assignees');
|
initListSubmits('select-assignees-modify', 'assignees');
|
||||||
|
initListSubmits('select-reviewers', 'reviewers');
|
||||||
initListSubmits('select-reviewers-modify', 'assignees');
|
initListSubmits('select-reviewers-modify', 'assignees');
|
||||||
|
|
||||||
// Milestone, Assignee, Project
|
// Milestone, Assignee, Project
|
||||||
selectItem('.select-project', '#project_id');
|
selectItem('.select-project', '#project_id');
|
||||||
selectItem('.select-milestone', '#milestone_id');
|
selectItem('.select-milestone', '#milestone_id');
|
||||||
selectItem('.select-assignee', '#assignee_id');
|
selectItem('.select-assignee', '#assignee_id');
|
||||||
|
selectItem('.select-reviewer', '#reviewer_id');
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user