Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
ulakbus-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ulakbus
ulakbus-ui
Commits
caaa7767
Commit
caaa7767
authored
Sep 30, 2015
by
Evren Kutar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
v0.0.3 BUG: datepicker select by year
linkedmodel modal fix
parent
ccc8eb21
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
form_service.js
app/zetalib/forms/form_service.js
+6
-6
app.js
dist/app.js
+1
-1
No files found.
app/zetalib/forms/form_service.js
View file @
caaa7767
...
...
@@ -281,8 +281,9 @@ form_generator.controller('ModalCtrl', function ($scope, $modalInstance, Generat
$scope
.
onSubmit
=
function
(
form
)
{
$scope
.
$broadcast
(
'schemaFormValidate'
);
console
.
log
(
form
.
$valid
);
if
(
form
.
$valid
){
//if (1 == 1) {
//if(form.$valid){
// todo: change to if form valid
if
(
1
==
1
)
{
// send form to modalinstance result function
$modalInstance
.
close
(
$scope
);
...
...
@@ -370,7 +371,6 @@ form_generator.directive('addModalForLinkedModel', function ($modal, Generator)
size
:
'lg'
,
resolve
:
{
items
:
function
()
{
return
Generator
.
get_form
({
url
:
'crud'
,
form_params
:
{
'model'
:
scope
.
form
.
model_name
,
"cmd"
:
"add"
}
...
...
@@ -380,7 +380,6 @@ form_generator.directive('addModalForLinkedModel', function ($modal, Generator)
});
modalInstance
.
result
.
then
(
function
(
childmodel
,
key
)
{
// todo: run form validator here
Generator
.
submit
(
childmodel
);
});
});
...
...
@@ -394,6 +393,8 @@ form_generator.directive('addModalForLinkedModel', function ($modal, Generator)
* @return: openmodal directive
*/
// todo: useless modal check if any use cases?? and delete if useless
form_generator
.
directive
(
'editModalForLinkedModel'
,
function
(
$modal
,
Generator
)
{
return
{
link
:
function
(
scope
,
element
)
{
...
...
@@ -414,8 +415,7 @@ form_generator.directive('editModalForLinkedModel', function ($modal, Generator)
});
modalInstance
.
result
.
then
(
function
(
childmodel
,
key
)
{
// todo: run form validator here
Generator
.
submit
(
scope
);
Generator
.
submit
(
childmodel
);
});
});
}
...
...
dist/app.js
View file @
caaa7767
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment