fixed dummy controller/factory call

DevilGatis · Sep 30, 2013 · 8007cfa · 8007cfa
1 parent 162ab36
commit 8007cfa
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/backend/java-backend/src/main/java/ngdemo/web/rest/ResponseCorsFilter.java b/backend/java-backend/src/main/java/ngdemo/web/rest/ResponseCorsFilter.java
@@ -28,8 +28,12 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
     }
 
     private void addHeadersFor200Response(HttpServletResponse response) {
-        response.addHeader("Access-Control-Allow-Origin", "*");
-        response.addHeader("Access-Control-Allow-Methods", "Cache-Control, Pragma, Origin, Authorization, Content-Type, X-Requested-With");
-        response.addHeader("Access-Control-Allow-Headers", "GET, PUT, OPTIONS, X-XSRF-TOKEN");
+//        response.addHeader("Access-Control-Allow-Origin", "*");
+//        response.addHeader("Access-Control-Allow-Methods", "*, Cache-Control, Pragma, Origin, Authorization, Content-Type, X-Requested-With");
+//        response.addHeader("Access-Control-Allow-Headers", "*, GET, PUT, OPTIONS, X-XSRF-TOKEN");
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        response.setHeader("Access-Control-Allow-Methods", "Cache-Control, Pragma, Origin, Authorization, Content-Type, X-Requested-With, Accept, Accept-Version");
+        response.setHeader("Access-Control-Allow-Headers", "GET, PUT, OPTIONS, X-XSRF-TOKEN");
+
     }
 }
diff --git a/frontend/app/scripts/controllers/dummy.js b/frontend/app/scripts/controllers/dummy.js
@@ -1,7 +1,12 @@
 'use strict';
 
 angular.module('ngdemoApp.dummyCtrl', [])
-.controller('DummyCtrl', function ($scope, dummyFactory) {
+.controller('DummyCtrl', function ($scope, $log, dummyFactory) {
+  $log.log('DummyCtrl loaded...');
+
   $scope.bla = 'bla from controller';
-  $scope.foo = dummyFactory.firstName;
+
+  dummyFactory.query({}, function (data) {
+    $scope.foo = data.firstName;
+  });
 });
diff --git a/frontend/app/scripts/services/dummyFactory.js b/frontend/app/scripts/services/dummyFactory.js
@@ -2,7 +2,8 @@
 
 var srv = angular.module('ngdemoApp.factory', ['ngResource']);
 
-srv.factory('dummyFactory', function ($resource) {
+srv.factory('dummyFactory', function ($resource, $log) {
+  $log.log('dummyFactory loaded...');
   return $resource('http://localhost\\:8080/ngdemo/web/dummy', {}, {
     query: { method: 'GET', params: {} }
   });