Kiu/Semaphore
Kiu/Semaphore
1
0
Fork 0
mirror of https://github.com/semaphoreui/semaphore.git synced 2024-11-23 12:30:41 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix(schedules): return only schedules with repo id for templates

Browse Source
This commit is contained in:
fiftin 2024-07-22 15:32:59 +05:00
parent 21ba6c6b64
commit 4bc7f156a9
No known key found for this signature in database
GPG Key ID: 044381366A5D4731
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/sql/schedule.go
View File

@ -91,7 +91,7 @@ func (d *SqlDb) GetProjectSchedules(projectID int) (schedules []db.ScheduleWithT
func (d *SqlDb) GetTemplateSchedules(projectID int, templateID int) (schedules []db.Schedule, err error) {
_, err = d.selectAll(&schedules,
"select * from project__schedule where project_id=? and template_id=?",
"SELECT * FROM project__schedule WHERE project_id=? AND template_id=? AND repository_id IS NOT NULL",
projectID,
templateID)
return

16
web/src/components/TemplateForm.vue
View File

@ -245,11 +245,11 @@
<v-checkbox
class="mt-0"
:label="$t('iWantToRunATaskByTheCronOnlyForForNewCommitsOfSome')"
v-model="cronRepositoryIdVisible"
v-model="cronVisible"
/>
<v-select
v-if="cronRepositoryIdVisible"
v-if="cronVisible"
v-model="cronRepositoryId"
:label="$t('repository2')"
:placeholder="$t('cronChecksNewCommitBeforeRun')"
@ -264,7 +264,7 @@
></v-select>
<v-select
v-if="cronRepositoryIdVisible"
v-if="cronVisible"
v-model="cronFormat"
:label="$t('Check interval')"
:hint="$t('New commit check interval')"
@ -369,7 +369,7 @@ export default {
buildTemplates: null,
cronFormat: '* * * * *',
cronRepositoryId: null,
cronRepositoryIdVisible: false,
cronVisible: false,
helpDialog: null,
helpKey: null,
@ -533,7 +533,7 @@ export default {
if (schedule != null) {
this.cronFormat = schedule.cron_format;
this.cronRepositoryId = schedule.repository_id;
this.cronRepositoryIdVisible = this.cronRepositoryId != null;
this.cronVisible = this.cronRepositoryId != null;
}
}
@ -569,7 +569,7 @@ export default {
async afterSave(newItem) {
if (newItem || this.schedules.length === 0) {
if (this.cronFormat != null && this.cronFormat !== '' && this.cronRepositoryIdVisible) {
if (this.cronFormat != null && this.cronFormat !== '' && this.cronVisible) {
// new schedule
await axios({
method: 'post',
@ -585,10 +585,10 @@ export default {
}
} else if (this.schedules.length > 1) {
// do nothing
} else if (this.cronFormat == null || this.cronFormat === '' || !this.cronRepositoryIdVisible) {
} else if (this.cronFormat == null || this.cronFormat === '' || !this.cronVisible) {
// drop schedule
await axios({
method: 'delete',
method: '',
url: `/api/project/${this.projectId}/schedules/${this.schedules[0].id}`,
responseType: 'json',
});