Skip to content

Commit

Permalink
Make paused campaigns editable.
Browse files Browse the repository at this point in the history
  • Loading branch information
knadh committed Jan 19, 2025
1 parent 5ba0adc commit 3d383cd
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
14 changes: 7 additions & 7 deletions cmd/campaigns.go
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ func handleUpdateCampaign(c echo.Context) error {
return err
}

if isCampaignalMutable(cm.Status) {
if !canEditCampaign(cm.Status) {
return echo.NewHTTPError(http.StatusBadRequest, app.i18n.T("campaigns.cantUpdate"))
}

Expand Down Expand Up @@ -597,12 +597,12 @@ func validateCampaignFields(c campaignReq, app *App) (campaignReq, error) {
return c, nil
}

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

// makeOptinCampaignMessage makes a default opt-in campaign message body.
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/views/Campaign.vue
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ export default Vue.extend({
canEdit() {
return this.isNew
|| this.data.status === 'draft' || this.data.status === 'scheduled';
|| this.data.status === 'draft' || this.data.status === 'scheduled' || this.data.status === 'paused';
},
canSchedule() {
Expand All @@ -625,7 +625,7 @@ export default Vue.extend({
},
canStart() {
return this.data.status === 'draft' && !this.data.sendAt;
return this.data.status === 'draft' || this.data.status === 'paused';
},
canArchive() {
Expand Down

0 comments on commit 3d383cd

Please sign in to comment.