Update for API refactoring

omeka-s-modules · Mar 21, 2017 · 6927d35 · 6927d35
1 parent a19e9a2
commit 6927d35
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/config/module.ini b/config/module.ini
@@ -1,6 +1,6 @@
 [info]
-version = "1.0.0-beta"
-omeka_version_constraint = "^1.0.0-beta"
+version = "1.0.0-beta2"
+omeka_version_constraint = "^1.0.0-beta3"
 name = "Custom Vocab"
 description = "Describe your resources using vocabularies you create."
 author = "Roy Rosenzweig Center for History & New Media"

diff --git a/src/Controller/IndexController.php b/src/Controller/IndexController.php
@@ -34,10 +34,8 @@ public function addAction()
             $form->setData($this->params()->fromPost());
             if ($form->isValid()) {
                 $formData = $form->getData();
-                $response = $this->api()->create('custom_vocabs', $formData);
-                if ($response->isError()) {
-                    $form->setMessages($response->getErrors());
-                } else {
+                $response = $this->api($form)->create('custom_vocabs', $formData);
+                if ($response) {
                     $this->messenger()->addSuccess('Custom vocab created.');
                     return $this->redirect()->toRoute('admin/custom-vocab');
                 }
@@ -63,10 +61,8 @@ public function editAction()
             $form->setData($this->params()->fromPost());
             if ($form->isValid()) {
                 $formData = $form->getData();
-                $response = $this->api()->update('custom_vocabs', $vocab->id(), $formData);
-                if ($response->isError()) {
-                    $form->setMessages($response->getErrors());
-                } else {
+                $response = $this->api($form)->update('custom_vocabs', $vocab->id(), $formData);
+                if ($response) {
                     $this->messenger()->addSuccess('Custom vocab updated.');
                     return $this->redirect()->toRoute('admin/custom-vocab');
                 }
@@ -87,10 +83,8 @@ public function deleteAction()
             $form = $this->getForm(ConfirmForm::class);
             $form->setData($this->getRequest()->getPost());
             if ($form->isValid()) {
-                $response = $this->api()->delete('custom_vocabs', $this->params('id'));
-                if ($response->isError()) {
-                    $this->messenger()->addError('Vocab could not be deleted');
-                } else {
+                $response = $this->api($form)->delete('custom_vocabs', $this->params('id'));
+                if ($response) {
                     $this->messenger()->addSuccess('Vocab successfully deleted');
                 }
             } else {