mirror of
https://codeberg.org/davrot/forgejo.git
synced 2025-07-03 13:00:17 +02:00
Merge plus fixing tests/e2e/declare_repos_test.go conflict
Some checks failed
Integration tests for the release process / release-simulation (push) Has been cancelled
Some checks failed
Integration tests for the release process / release-simulation (push) Has been cancelled
This commit is contained in:
commit
4e8e3fafe7
103 changed files with 1748 additions and 1101 deletions
|
@ -340,10 +340,10 @@ export default sfc; // activate the IDE's Vue plugin
|
|||
<a :class="{item: true, active: tab === 'organizations'}" @click="changeTab('organizations')">{{ textMyOrgs }} <span class="ui grey label tw-ml-2">{{ organizationsTotalCount }}</span></a>
|
||||
</div>
|
||||
<div v-show="tab === 'repos'" class="ui tab active list dashboard-repos">
|
||||
<h4 v-if="isOrganization" class="ui top attached tw-mt-4 tw-flex tw-items-center">
|
||||
<div class="tw-flex-1 tw-flex tw-items-center">
|
||||
<h4 v-if="isOrganization" class="tw-mt-4 tw-flex tw-items-center">
|
||||
<div class="tw-flex-1 tw-flex tw-gap-2 tw-items-center">
|
||||
{{ textMyRepos }}
|
||||
<span class="ui grey label tw-ml-2">{{ reposTotalCount }}</span>
|
||||
<span class="ui grey label">{{ reposTotalCount }}</span>
|
||||
</div>
|
||||
</h4>
|
||||
<div class="ui top attached segment repos-search">
|
||||
|
|
|
@ -125,16 +125,21 @@ function excludeLabel(item) {
|
|||
export function initRepoIssueSidebarList() {
|
||||
const repolink = $('#repolink').val();
|
||||
const repoId = $('#repoId').val();
|
||||
const crossRepoSearch = $('#crossRepoSearch').val();
|
||||
const crossRepoSearch = $('#crossRepoSearch').val() === 'true';
|
||||
const tp = $('#type').val();
|
||||
let issueSearchUrl = `${appSubUrl}/${repolink}/issues/search?q={query}&type=${tp}`;
|
||||
if (crossRepoSearch === 'true') {
|
||||
issueSearchUrl = `${appSubUrl}/issues/search?q={query}&priority_repo_id=${repoId}&type=${tp}`;
|
||||
}
|
||||
$('#new-dependency-drop-list')
|
||||
.dropdown({
|
||||
apiSettings: {
|
||||
url: issueSearchUrl,
|
||||
beforeSend(settings) {
|
||||
if (!settings.urlData.query.trim()) {
|
||||
settings.url = `${appSubUrl}/${repolink}/issues/search?q={query}&type=${tp}&sort=updated`;
|
||||
} else if (crossRepoSearch) {
|
||||
settings.url = `${appSubUrl}/issues/search?q={query}&priority_repo_id=${repoId}&type=${tp}&sort=relevance`;
|
||||
} else {
|
||||
settings.url = `${appSubUrl}/${repolink}/issues/search?q={query}&type=${tp}&sort=relevance`;
|
||||
}
|
||||
return settings;
|
||||
},
|
||||
onResponse(response) {
|
||||
const filteredResponse = {success: true, results: []};
|
||||
const currIssueId = $('#new-dependency-drop-list').data('issue-id');
|
||||
|
@ -142,7 +147,7 @@ export function initRepoIssueSidebarList() {
|
|||
for (const [_, issue] of Object.entries(response)) {
|
||||
// Don't list current issue in the dependency list.
|
||||
if (issue.id === currIssueId) {
|
||||
return;
|
||||
continue;
|
||||
}
|
||||
filteredResponse.results.push({
|
||||
name: `#${issue.number} ${issueTitleHTML(htmlEscape(issue.title))
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import * as htmx from 'htmx.org';
|
||||
import htmx from 'htmx.org';
|
||||
import {showErrorToast} from './modules/toast.js';
|
||||
|
||||
// https://github.com/bigskysoftware/idiomorph#htmx
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue