diff --git a/members/static/html/jasenhakemukset.html b/members/static/html/jasenhakemukset.html index 3c42515..e6eda34 100644 --- a/members/static/html/jasenhakemukset.html +++ b/members/static/html/jasenhakemukset.html @@ -21,7 +21,7 @@
- Muokkaa + Muokkaa
diff --git a/members/static/html/muokkaa_hakemusta.html b/members/static/html/muokkaa_hakemusta.html index 5eb0bec..0d71c95 100644 --- a/members/static/html/muokkaa_hakemusta.html +++ b/members/static/html/muokkaa_hakemusta.html @@ -1,21 +1,21 @@ -

Muokkaa hakemuksen jäsentietoja

+

Muokkaa hakemuksen jäsentietoja

- +
- +
- +
- +
diff --git a/members/static/js/members_controllers.js b/members/static/js/members_controllers.js index 410dc1f..3f4001d 100644 --- a/members/static/js/members_controllers.js +++ b/members/static/js/members_controllers.js @@ -27,7 +27,7 @@ app.controller("getController", function($scope, $http, $window, $location){ // http://ned.im/noty/#/about }); - $location.path("#/list"); + $location.path("/list"); }, function(response) { noty({ @@ -36,7 +36,7 @@ app.controller("getController", function($scope, $http, $window, $location){ type: "error", timeout: 10000 }); - $location.path("#/list"); + $location.path("/list"); } ); }; @@ -98,7 +98,7 @@ app.controller("postController", function($scope, $http, $location) { type: "success", timeout: 10000 }); - $location.path("#/list"); + $location.path("/list"); }); } }); @@ -116,11 +116,11 @@ app.controller("editController", function($scope, $http, $route, $routeParams, $ type: "success", timeout: 10000 }); - $location.path("#/list"); + $location.path("/list"); }); } $scope.cancel = function() { //user canceled. return to list - $location.path("#/list"); + $location.path("/list"); } }); @@ -137,7 +137,7 @@ app.controller("applController", function($scope, $http, $route, $routeParams, $ type: "success", timeout: 10000 }); - $location.path("#/applications"); + $location.path("/applications"); }, function(response) { noty({ @@ -146,7 +146,7 @@ app.controller("applController", function($scope, $http, $route, $routeParams, $ type: "success", timeout: 10000 }); - $location.path("#/applications"); + $location.path("/applications"); } ); }; @@ -159,7 +159,7 @@ app.controller("applController", function($scope, $http, $route, $routeParams, $ type: "success", timeout: 10000 }); - $location.path("#/applications"); + $location.path("/applications"); }, function(response) { noty({ @@ -168,7 +168,7 @@ app.controller("applController", function($scope, $http, $route, $routeParams, $ type: "success", timeout: 10000 }); - $location.path("#/applications"); + $location.path("/applications"); } ); }; @@ -177,21 +177,21 @@ app.controller("applController", function($scope, $http, $route, $routeParams, $ app.controller("appleditController", function($scope, $http, $route, $routeParams, $window, $location){ $scope.application = {"id": $routeParams.id}; $http.get("/members/api/request/"+$scope.application.id).then(function(response){ - $scope.application_data = response.data; + $scope.application = response.data; }); $scope.sendappl = function() { - $http.put("/members/api/request/"+$scope.application_data.id, $scope.application_data).then(function(data){ + $http.put("/members/api/request/"+$scope.application.id, $scope.application).then(function(data){ noty({ text: "Jäsentiedot tallennettu", layout: "bottomRight", type: "success", timeout: 10000 }); - $location.path("#/applications"); + $location.path("/applications"); }); }; $scope.cancelappl = function() { //user canceled. return to applications - $location.path("#/applications"); + $location.path("/applications"); }; }); diff --git a/members/static/js/members_routers.js b/members/static/js/members_routers.js index 663bfed..7c274a7 100644 --- a/members/static/js/members_routers.js +++ b/members/static/js/members_routers.js @@ -20,7 +20,7 @@ app.config(['$routeProvider', function($routeProvider){ templateUrl:"/static/html/jasenhakemukset.html", controller:'applController', }) - .when('applications/edit/:id',{ + .when('/applications/edit/:id',{ templateUrl:"/static/html/muokkaa_hakemusta.html", controller:'appleditController', })