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
b75c54c4
Commit
b75c54c4
authored
Dec 05, 2015
by
Evren Kutar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
resolves #56
resolves #57
parent
48409879
Changes
2
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
6 deletions
+11
-6
form_service.js
app/zetalib/form_service.js
+9
-4
app.js
dist/app.js
+2
-2
No files found.
app/zetalib/form_service.js
View file @
b75c54c4
...
...
@@ -240,7 +240,7 @@ angular.module('formService', ['ui.bootstrap'])
if
(
v
.
type
===
'model'
)
{
var
formitem
=
scope
.
form
[
scope
.
form
.
indexOf
(
k
)];
var
modelScope
=
{
"url"
:
v
.
wf
,
"form_params"
:
{
model
:
v
.
model_name
,
cmd
:
v
.
list_cmd
}};
var
modelScope
=
{
"url"
:
v
.
wf
,
"
wf"
:
v
.
wf
,
"
form_params"
:
{
model
:
v
.
model_name
,
cmd
:
v
.
list_cmd
}};
//scope.$on('refreshTitleMap', function (event, data) {
// todo: write a function to refresh titleMap after new item add to linkedModel
...
...
@@ -304,7 +304,7 @@ angular.module('formService', ['ui.bootstrap'])
if
((
v
.
type
===
'ListNode'
||
v
.
type
===
'Node'
)
&&
v
.
widget
===
'filter_interface'
)
{
var
formitem
=
scope
.
form
[
scope
.
form
.
indexOf
(
k
)];
var
modelScope
=
{
"url"
:
v
.
wf
||
scope
.
wf
,
"url"
:
v
.
wf
||
scope
.
wf
,
"wf"
:
v
.
wf
||
scope
.
wf
,
"form_params"
:
{
model
:
v
.
model_name
||
v
.
schema
[
0
].
model_name
,
cmd
:
v
.
list_cmd
||
'select_list'
}
};
...
...
@@ -407,7 +407,8 @@ angular.module('formService', ['ui.bootstrap'])
formType
:
v
.
type
,
model_name
:
k
},
url
:
scope
.
url
url
:
scope
.
url
,
wf
:
scope
.
wf
});
if
(
v
.
type
===
'ListNode'
)
{
...
...
@@ -811,6 +812,7 @@ angular.module('formService', ['ui.bootstrap'])
});
var
newscope
=
{
wf
:
scope
.
node
.
wf
,
url
:
scope
.
node
.
url
,
form_params
:
{
model
:
scope
.
node
.
schema
.
model_name
},
edit
:
attribs
[
3
]
...
...
@@ -851,8 +853,10 @@ angular.module('formService', ['ui.bootstrap'])
listNodeItem
.
model
[
childmodel
.
edit
]
=
childmodel
.
model
;
}
else
{
listNodeItem
.
model
.
push
(
angular
.
copy
(
childmodel
.
model
));
if
(
reformattedModel
!==
{})
{
listNodeItem
.
items
.
push
(
reformattedModel
);
}
}
listNodeItem
.
lengthModels
+=
1
;
}
});
...
...
@@ -886,6 +890,7 @@ angular.module('formService', ['ui.bootstrap'])
var
formName
=
attributes
.
addModalForLinkedModel
;
return
Generator
.
get_form
({
url
:
scope
.
form
.
wf
,
wf
:
scope
.
form
.
wf
,
form_params
:
{
model
:
scope
.
form
.
model_name
,
cmd
:
scope
.
form
.
add_cmd
},
modalElements
:
{
// define button position properties
...
...
dist/app.js
View file @
b75c54c4
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