Merge pull request #12 from dreamfactorysoftware/develop

Wrap post and put requests data in resource

Author: javascriptboss99

README.md

@@ -135,7 +135,7 @@ angular.module('your-app', [ 'ngResource' ])
     '$resource',
 
     function ($resource) {
-        return $resource('/api/v2/_table/Model', {
+        return $resource('/api/v2/_table/Model', {}, {
             query: {
                 method: 'GET',
                 isArray: false // true if response is an array

add_angular.dfpkg

@@ -12,9 +12,9 @@ angular.module('addressbook', [
 
 ])
 
-.constant('INSTANCE_URL', '')
+.constant('INSTANCE_URL', 'https://dreamfactory:8888')
 
-.constant('APP_API_KEY', 'b6b16dab500f8c9649e365410200a09ad30dc2b3a202f56611d9f6e98f7729c0')
+.constant('APP_API_KEY', '0c7b9f992741c6119c1614557615490080e8187199db589d33d0d35127bcb74a')
 
 .run([
 	'$cookies', 'APP_API_KEY', '$http', '$rootScope', '$window',
@@ -68,18 +68,31 @@ angular.module('addressbook', [
 
 			request: function (config) {
 
+				var ignoreWrapping = false;
+
+				if (config.url.indexOf ('/user/register') > -1 || config.url.indexOf ('/user/session') > -1) {
+					ignoreWrapping = true;
+				}
+
 				// Append instance url before every api call
 				if (config.url.indexOf('/api/v2') > -1) {
 					config.url = INSTANCE_URL + config.url;
+
+					if ((config.method == 'POST' || config.method == 'PUT' || config.method == 'PATCH') && !ignoreWrapping) {
+						var data;
+						if (Array.isArray(config.data)) {
+							config.data = { resource: config.data };
+						} else {
+							config.data = { resource: [config.data] };
+						}
+					}
 				};
 
 				// delete x-dreamfactory-session-token header if login
 				if (config.method.toLowerCase() === 'post' && config.url.indexOf('/api/v2/user/session') > -1) {
 					delete config.headers['X-DreamFactory-Session-Token'];
 				}
 
-				console.log(config);
-
 				return config;
 			},
 

add_angular.zip

@@ -69,13 +69,14 @@ angular.module('contact-info', [
 
 
 		$scope.addEditContactInfo = function (ev, item) {
+			console.log('Contact info')
 			$mdDialog.show({
 		    	controller: 'ContactInfoUpdateCtrl',
 		    	templateUrl: 'app/contact-info/contact-info-add-edit.html',
 		    	parent: angular.element(document.body),
 		    	targetEvent: ev,
 		    	locals: {
-		    		contactInfo: item || { contact_id: $route.current.params.id, id: '' }
+		    		contactInfo: item || { contact_id: $route.current.params.id }
 		    	}
 			}).then(function () {
 				$scope.loadData();
@@ -93,6 +94,9 @@ angular.module('contact-info', [
 	function ($mdScope, $mdDialog, ContactInfo, contactInfo, $mdToast) {
 		$mdScope.contactInfo = angular.copy(contactInfo);
 		$mdScope.info_types = [ 'home', 'work', 'mobile' ];
+		if ($mdScope.contactInfo.id === '') {
+			delete $mdScope.contactInfo;
+		}
 
 		$mdScope.submit = function () {
 			if (!$mdScope.contactInfo.id) {

add_angular/app/app.js

@@ -29,7 +29,7 @@ angular.module('contacts', [
 		    	controller 	: 'ContactsItemCtrl',
 		    	resolve		: {
 		    		contact: function () {
-		    			return { id: null };
+		    			return { };
 		    		},
 		    		groups: function (Groups) {
 		    			return	Groups.query().$promise;
@@ -201,7 +201,7 @@ angular.module('contacts', [
 		    	parent: angular.element(document.body),
 		    	targetEvent: ev,
 		    	locals: {
-		    		contactInfo: item || { contact_id: $route.current.params.id, id: '' }
+		    		contactInfo: item || { contact_id: $route.current.params.id }
 		    	}
 			}).then(function () {
 				$scope.loadData();

add_angular/app/contact-info/contact-info.js

@@ -68,7 +68,7 @@ <h3>
                     <md-divider></md-divider>
                 </div>
 
-                <h5 flex="" class="sticky-bottom">Angular Addressbook v1.0.2</h5>
+                <h5 flex="" class="sticky-bottom">Angular Addressbook v1.0.4</h5>
             </md-content>
         </md-sidenav>