Skip to content

Commit 3d383cd

Browse files
committed
Make paused campaigns editable.
1 parent 5ba0adc commit 3d383cd

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

cmd/campaigns.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ func handleUpdateCampaign(c echo.Context) error {
248248
return err
249249
}
250250

251-
if isCampaignalMutable(cm.Status) {
251+
if !canEditCampaign(cm.Status) {
252252
return echo.NewHTTPError(http.StatusBadRequest, app.i18n.T("campaigns.cantUpdate"))
253253
}
254254

@@ -597,12 +597,12 @@ func validateCampaignFields(c campaignReq, app *App) (campaignReq, error) {
597597
return c, nil
598598
}
599599

600-
// isCampaignalMutable tells if a campaign's in a state where it's
601-
// properties can be mutated.
602-
func isCampaignalMutable(status string) bool {
603-
return status == models.CampaignStatusRunning ||
604-
status == models.CampaignStatusCancelled ||
605-
status == models.CampaignStatusFinished
600+
// canEditCampaign returns true if a campaign is in a status where updating
601+
// its properties is allowed.
602+
func canEditCampaign(status string) bool {
603+
return status == models.CampaignStatusDraft ||
604+
status == models.CampaignStatusPaused ||
605+
status == models.CampaignStatusScheduled
606606
}
607607

608608
// makeOptinCampaignMessage makes a default opt-in campaign message body.

frontend/src/views/Campaign.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ export default Vue.extend({
613613
614614
canEdit() {
615615
return this.isNew
616-
|| this.data.status === 'draft' || this.data.status === 'scheduled';
616+
|| this.data.status === 'draft' || this.data.status === 'scheduled' || this.data.status === 'paused';
617617
},
618618
619619
canSchedule() {
@@ -625,7 +625,7 @@ export default Vue.extend({
625625
},
626626
627627
canStart() {
628-
return this.data.status === 'draft' && !this.data.sendAt;
628+
return this.data.status === 'draft' || this.data.status === 'paused';
629629
},
630630
631631
canArchive() {

0 commit comments

Comments
 (0)