From 942d41c41bbdd2e0eedd8009c2944457609e3d88 Mon Sep 17 00:00:00 2001 From: HooVee Date: Mon, 8 Aug 2016 20:40:46 +0300 Subject: [PATCH] Added router to applications, added application controller --- members/static/html/jasenhakemukset.html | 10 +--------- members/static/js/members_controllers.js | 4 ++-- members/static/js/members_routers.js | 4 ++++ 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/members/static/html/jasenhakemukset.html b/members/static/html/jasenhakemukset.html index 79d2453..4ead7d9 100644 --- a/members/static/html/jasenhakemukset.html +++ b/members/static/html/jasenhakemukset.html @@ -1,13 +1,5 @@

Jäsenhakemukset

- - - - - - - - -
{{ x.submitted }}{{ x.member }}
+
\ No newline at end of file diff --git a/members/static/js/members_controllers.js b/members/static/js/members_controllers.js index ec3cf0c..8c9e2ae 100644 --- a/members/static/js/members_controllers.js +++ b/members/static/js/members_controllers.js @@ -66,8 +66,8 @@ app.controller("editController", function($scope, $http, $route, $routeParams, $ } }); -/*app.controller("applController", function($scope, $http){ +app.controller("applController", function($scope, $http){ $http.get("/members/api/requests").then(function(response){ $scope.applications = response.data; }); -});*/ +}); diff --git a/members/static/js/members_routers.js b/members/static/js/members_routers.js index d5e66e4..c68b814 100644 --- a/members/static/js/members_routers.js +++ b/members/static/js/members_routers.js @@ -24,6 +24,10 @@ app.config(['$routeProvider', function($routeProvider){ templateUrl:"/static/html/muokkaa_jasenta.html", controller:'editController', }) + .when('/applications',{ + templateUrl:'/static/html/jasenhakemukset.html', + controller:'applController', + }) .otherwise({ 'redirectTo':"/" })