start annotation submitting process

Islandora-Labs · Jan 4, 2016 · 5bf20d7 · 5bf20d7
1 parent 4959896
commit 5bf20d7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/includes/annotation.inc b/includes/annotation.inc
@@ -86,7 +86,7 @@ function _create_web_annotation() {
 //  return drupal_json_output(array('message' => 'posted', 'results' => $_POST));
 //  return drupal_json_output($_POST);
 //  return 'A new annotation is added.';
-  return drupal_json_output("success");
+  return drupal_json_output(array('annotation' => $_POST, 'response' => 'success'));
 }
 
 /**

diff --git a/js/annotationApp.js b/js/annotationApp.js
@@ -10,7 +10,7 @@
             var targetObjectId = Drupal.settings.islandoraOralhistories.objectId;
             var enableAnnotation = Drupal.settings.islandoraOralhistories.enableAnnotationTabDisplay;
             var videoElement = $(".islandora-oralhistories-object").find('video, audio')[0];
-            var apiUrl = '/islandora/object/' + targetObjectId + '/web_annotation/create';
+            var apiUrl = '/islandora/object/' + targetObjectId + '/web_annotation';
             var user = Drupal.settings.islandoraOralhistories.user;
             var permissions = Drupal.settings.islandoraOralhistories.permissions;
             console.log(permissions);
@@ -36,17 +36,17 @@
                 handleAnnotationSubmit: function (annotation) {
                     var arr = this.state.annotations;
                     $.ajax({
-                        url: this.props.url,
+                        url: this.props.url + '/create',
                         dataType: 'json',
                         type: 'POST',
                         data: annotation,
                         success: (function (data) {
-                            if (data == 'success') {
+                            console.log(data);
+                            if (data.response == 'success') {
                                 arr.push(annotation);
                                 this.setState({ annotations: arr });
                                 this.setState({ adding: false }); // Hide the form after submission
                             }
-                            console.dir(data);
                         }).bind(this),
                         error: (function (xhr, status, err) {
                             console.error(this.props.url, status, err.toString());

diff --git a/js/source/annotationApp.js b/js/source/annotationApp.js
@@ -10,7 +10,7 @@
             var targetObjectId = Drupal.settings.islandoraOralhistories.objectId;
             var enableAnnotation = Drupal.settings.islandoraOralhistories.enableAnnotationTabDisplay;
             var videoElement = $(".islandora-oralhistories-object").find('video, audio')[0];
-            var apiUrl = '/islandora/object/' + targetObjectId + '/web_annotation/create';
+            var apiUrl = '/islandora/object/' + targetObjectId + '/web_annotation';
             var user = Drupal.settings.islandoraOralhistories.user;
             var permissions = Drupal.settings.islandoraOralhistories.permissions;
             console.log(permissions);
@@ -35,17 +35,17 @@
                 handleAnnotationSubmit: function(annotation) {
                     var arr = this.state.annotations;
                     $.ajax({
-                        url: this.props.url,
+                        url: this.props.url + '/create',
                         dataType: 'json',
                         type: 'POST',
                         data: annotation,
                         success: function(data) {
-                            if (data == 'success') {
+                            console.log(data);
+                            if (data.response == 'success') {
                                 arr.push(annotation);
                                 this.setState({annotations: arr});
                                 this.setState({adding: false}); // Hide the form after submission
                             }
-                            console.dir(data);
 
                         }.bind(this),
                         error: function(xhr, status, err) {