Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 07:06:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/struts into develop

Browse Source
This commit is contained in:
Lukasz Lenart
2015-05-15 21:36:20 +02:00
parent ebb1e3fe39 01279636d9
commit 003fe35c90
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
+4 -4
View File
@@ -24,12 +24,12 @@ angularStrutsApp.controller('HomeController', function ($scope) {
$scope.name = "Sunshine";
});
angularStrutsApp.controller('ApacheProjectsController', function ($scope, $http, DataService) {
angularStrutsApp.controller('ApacheProjectsController', function ($scope, $log, DataService) {
this.init = function() {
DataService.getProjects().then(function(data) {
$scope.projects = data.data.projectNames;
}, function(data) {
console.log('Could not receive project names.')
$scope.projects = data.projectNames;
}, function() {
$log.error('Could not receive project names.')
});
};
archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/services.js
+8 -7
View File
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
angularStrutsApp.factory('DataService', ['$http', '$q', function($http, $q) {
angularStrutsApp.factory('DataService', ['$http', '$log', '$q', function($http, $log, $q) {
var DataService = {
urls : {
@@ -32,18 +32,19 @@ angularStrutsApp.factory('DataService', ['$http', '$q', function($http, $q) {
}
var def = $q.defer();
if(method === 'GET') {
return $http.get(url).success(function(data) {
DataService.data = data;
$http.get(url).success(function(data) {
def.resolve(data);
}).error(function() {
def.reject("Failed to get data");
}).error(function(data, code) {
def.reject(data);
$log.error(data, code);
});
} else if(method === 'POST'){
$http.post(url, model).success(function(data) {
DataService.data = data;
def.resolve(data);
}).error(function() {
def.reject("Failed to post data");
}).error(function(data, code) {
def.reject(data);
$log.error(data, code);
});
}
return def.promise;