Skip to content

Commit 63ccbff

Browse files
committed
Fix term revisions error
1 parent ac185f3 commit 63ccbff

1 file changed

Lines changed: 3 additions & 23 deletions

File tree

src/Http/Controllers/CP/Taxonomies/TermsController.php

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,6 @@ public function edit(Request $request, $taxonomy, $term)
104104
'save' => $term->updateUrl(),
105105
'publish' => $term->publishUrl(),
106106
'unpublish' => $term->unpublishUrl(),
107-
'revisions' => $term->revisionsUrl(),
108-
'restore' => $term->restoreRevisionUrl(),
109-
'createRevision' => $term->createRevisionUrl(),
110107
'editBlueprint' => cp_route('blueprints.taxonomies.edit', [$taxonomy, $blueprint]),
111108
],
112109
'values' => array_merge($values, ['id' => $term->id()]),
@@ -137,7 +134,6 @@ public function edit(Request $request, $taxonomy, $term)
137134
];
138135
})->all(),
139136
'hasWorkingCopy' => $term->hasWorkingCopy(),
140-
'revisionsEnabled' => $term->revisionsEnabled(),
141137
'previewTargets' => $taxonomy->previewTargets()->all(),
142138
'itemActions' => Action::for($term, ['taxonomy' => $taxonomy->handle(), 'view' => 'form']),
143139
'hasTemplate' => view()->exists($term->template()),
@@ -197,18 +193,9 @@ public function update(Request $request, $taxonomy, $term, $site)
197193

198194
$term->slug($request->slug);
199195

200-
if ($term->revisionsEnabled() && $term->published()) {
201-
$term
202-
->makeWorkingCopy()
203-
->user(User::current())
204-
->save();
205-
} else {
206-
if (! $term->revisionsEnabled()) {
207-
$term->published($request->published);
208-
}
196+
$term->published($request->published);
209197

210-
$saved = $term->updateLastModified(User::current())->save();
211-
}
198+
$saved = $term->updateLastModified(User::current())->save();
212199

213200
[$values] = $this->extractFromFields($term, $term->blueprint());
214201

@@ -319,14 +306,7 @@ public function store(Request $request, $taxonomy, $site)
319306
->data($values)
320307
->slug($slug);
321308

322-
if ($term->revisionsEnabled()) {
323-
$term->store([
324-
'message' => $request->message,
325-
'user' => User::current(),
326-
]);
327-
} else {
328-
$saved = $term->updateLastModified(User::current())->save();
329-
}
309+
$saved = $term->updateLastModified(User::current())->save();
330310

331311
return (new TermResource($term))
332312
->additional(['saved' => $saved]);

0 commit comments

Comments
 (0)