Commit caaa7767 authored by Evren Kutar's avatar Evren Kutar

v0.0.3 BUG: datepicker select by year

linkedmodel modal fix
parent ccc8eb21
...@@ -281,8 +281,9 @@ form_generator.controller('ModalCtrl', function ($scope, $modalInstance, Generat ...@@ -281,8 +281,9 @@ form_generator.controller('ModalCtrl', function ($scope, $modalInstance, Generat
$scope.onSubmit = function (form) { $scope.onSubmit = function (form) {
$scope.$broadcast('schemaFormValidate'); $scope.$broadcast('schemaFormValidate');
console.log(form.$valid); console.log(form.$valid);
if(form.$valid){ //if(form.$valid){
//if (1 == 1) { // todo: change to if form valid
if (1 == 1) {
// send form to modalinstance result function // send form to modalinstance result function
$modalInstance.close($scope); $modalInstance.close($scope);
...@@ -370,7 +371,6 @@ form_generator.directive('addModalForLinkedModel', function ($modal, Generator) ...@@ -370,7 +371,6 @@ form_generator.directive('addModalForLinkedModel', function ($modal, Generator)
size: 'lg', size: 'lg',
resolve: { resolve: {
items: function () { items: function () {
return Generator.get_form({ return Generator.get_form({
url: 'crud', url: 'crud',
form_params: {'model': scope.form.model_name, "cmd": "add"} form_params: {'model': scope.form.model_name, "cmd": "add"}
...@@ -380,7 +380,6 @@ form_generator.directive('addModalForLinkedModel', function ($modal, Generator) ...@@ -380,7 +380,6 @@ form_generator.directive('addModalForLinkedModel', function ($modal, Generator)
}); });
modalInstance.result.then(function (childmodel, key) { modalInstance.result.then(function (childmodel, key) {
// todo: run form validator here
Generator.submit(childmodel); Generator.submit(childmodel);
}); });
}); });
...@@ -394,6 +393,8 @@ form_generator.directive('addModalForLinkedModel', function ($modal, Generator) ...@@ -394,6 +393,8 @@ form_generator.directive('addModalForLinkedModel', function ($modal, Generator)
* @return: openmodal directive * @return: openmodal directive
*/ */
// todo: useless modal check if any use cases?? and delete if useless
form_generator.directive('editModalForLinkedModel', function ($modal, Generator) { form_generator.directive('editModalForLinkedModel', function ($modal, Generator) {
return { return {
link: function (scope, element) { link: function (scope, element) {
...@@ -414,8 +415,7 @@ form_generator.directive('editModalForLinkedModel', function ($modal, Generator) ...@@ -414,8 +415,7 @@ form_generator.directive('editModalForLinkedModel', function ($modal, Generator)
}); });
modalInstance.result.then(function (childmodel, key) { modalInstance.result.then(function (childmodel, key) {
// todo: run form validator here Generator.submit(childmodel);
Generator.submit(scope);
}); });
}); });
} }
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment