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
2338807e
Commit
2338807e
authored
Sep 18, 2015
by
Evren Kutar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
v0.0.3.1 model_name fix for linked model
parent
f03ce80a
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
9 deletions
+13
-9
sidebar.html
app/shared/templates/directives/sidebar.html
+1
-1
form_service.js
app/zetalib/forms/form_service.js
+10
-6
app.js
dist/app.js
+1
-1
templates.js
dist/templates.js
+1
-1
No files found.
app/shared/templates/directives/sidebar.html
View file @
2338807e
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
<ul
class=
"nav nav-second-level"
collapse=
"collapseVar!={{key}}"
>
<ul
class=
"nav nav-second-level"
collapse=
"collapseVar!={{key}}"
>
<li
ng-repeat=
"(k, v) in item[1]"
ng-init=
"third=!third"
<li
ng-repeat=
"(k, v) in item[1]"
ng-init=
"third=!third"
ng-class=
"{active: multiCollapseVar==$index}"
>
ng-class=
"{active: multiCollapseVar==$index}"
>
<a
href=
""
ng-click=
"multiCheck($index)"
>
{{v[
1
]}}
<span
class=
"fa arrow"
></span></a>
<a
href=
""
ng-click=
"multiCheck($index)"
>
{{v[
0
]}}
<span
class=
"fa arrow"
></span></a>
<ul
class=
"nav nav-third-level"
collapse=
"multiCollapseVar!={{$index}}"
>
<ul
class=
"nav nav-third-level"
collapse=
"multiCollapseVar!={{$index}}"
>
<li>
<li>
<a
href=
"#/{{v[1]}}"
>
Listele
</a>
<a
href=
"#/{{v[1]}}"
>
Listele
</a>
...
...
app/zetalib/forms/form_service.js
View file @
2338807e
...
@@ -70,7 +70,8 @@ form_generator.factory('Generator', function ($http, $q, $log, $location, $modal
...
@@ -70,7 +70,8 @@ form_generator.factory('Generator', function ($http, $q, $log, $location, $modal
if
(
k
.
type
==
'model'
)
{
if
(
k
.
type
==
'model'
)
{
var
formitem
=
scope
.
form
[
scope
.
form
.
indexOf
(
v
)];
var
formitem
=
scope
.
form
[
scope
.
form
.
indexOf
(
v
)];
var
modelscope
=
{
"url"
:
scope
.
url
,
"form_params"
:
{
model
:
k
.
title
}};
debugger
;
var
modelscope
=
{
"url"
:
scope
.
url
,
"form_params"
:
{
model
:
k
.
model_name
}};
formitem
=
{
formitem
=
{
"type"
:
"template"
,
"type"
:
"template"
,
...
@@ -105,10 +106,12 @@ form_generator.factory('Generator', function ($http, $q, $log, $location, $modal
...
@@ -105,10 +106,12 @@ form_generator.factory('Generator', function ($http, $q, $log, $location, $modal
scope
[
k
.
type
]
=
scope
[
k
.
type
]
?
scope
[
k
.
type
]
:
{};
scope
[
k
.
type
]
=
scope
[
k
.
type
]
?
scope
[
k
.
type
]
:
{};
debugger
;
scope
[
k
.
type
][
k
.
title
]
=
{
scope
[
k
.
type
][
k
.
title
]
=
{
title
:
k
.
title
,
title
:
k
.
title
,
form
:
[],
form
:
[],
schema
:
{
properties
:
{},
required
:
[],
title
:
k
.
title
,
type
:
"object"
,
formType
:
k
.
type
},
schema
:
{
properties
:
{},
required
:
[],
title
:
k
.
title
,
type
:
"object"
,
formType
:
k
.
type
,
model_name
:
v
},
url
:
scope
.
url
url
:
scope
.
url
};
};
...
@@ -281,13 +284,14 @@ form_generator.directive('modalForNodes', function ($modal) {
...
@@ -281,13 +284,14 @@ form_generator.directive('modalForNodes', function ($modal) {
//var subfix = scope.schema.title.replace(/([a-z])([A-Z])/g, '$1_$2').toLowerCase();
//var subfix = scope.schema.title.replace(/([a-z])([A-Z])/g, '$1_$2').toLowerCase();
if
(
childmodel
.
schema
.
formType
==
'Node'
){
if
(
childmodel
.
schema
.
formType
==
'Node'
){
scope
.
$parent
.
model
[
childmodel
.
schema
.
titl
e
]
=
childmodel
.
model
;
scope
.
$parent
.
model
[
childmodel
.
schema
.
model_nam
e
]
=
childmodel
.
model
;
}
}
if
(
childmodel
.
schema
.
formType
==
'ListNode'
){
if
(
childmodel
.
schema
.
formType
==
'ListNode'
){
if
(
scope
.
$parent
.
model
[
childmodel
.
schema
.
title
]
==
null
){
debugger
;
scope
.
$parent
.
model
[
childmodel
.
schema
.
title
]
=
[];
if
(
scope
.
$parent
.
model
[
childmodel
.
schema
.
model_name
]
==
null
){
scope
.
$parent
.
model
[
childmodel
.
schema
.
model_name
]
=
[];
}
}
scope
.
$parent
.
model
[
childmodel
.
schema
.
titl
e
].
push
(
childmodel
.
model
);
scope
.
$parent
.
model
[
childmodel
.
schema
.
model_nam
e
].
push
(
childmodel
.
model
);
}
}
childmodel
.
lengthModels
+=
1
;
childmodel
.
lengthModels
+=
1
;
});
});
...
...
dist/app.js
View file @
2338807e
This diff is collapsed.
Click to expand it.
dist/templates.js
View file @
2338807e
...
@@ -1013,7 +1013,7 @@ angular.module("shared/templates/directives/sidebar.html", []).run(["$templateCa
...
@@ -1013,7 +1013,7 @@ angular.module("shared/templates/directives/sidebar.html", []).run(["$templateCa
" <ul class=
\"
nav nav-second-level
\"
collapse=
\"
collapseVar!={{key}}
\"
>
\n
"
+
" <ul class=
\"
nav nav-second-level
\"
collapse=
\"
collapseVar!={{key}}
\"
>
\n
"
+
" <li ng-repeat=
\"
(k, v) in item[1]
\"
ng-init=
\"
third=!third
\"\n
"
+
" <li ng-repeat=
\"
(k, v) in item[1]
\"
ng-init=
\"
third=!third
\"\n
"
+
" ng-class=
\"
{active: multiCollapseVar==$index}
\"
>
\n
"
+
" ng-class=
\"
{active: multiCollapseVar==$index}
\"
>
\n
"
+
" <a href=
\"\"
ng-click=
\"
multiCheck($index)
\"
>{{v[
1
]}} <span class=
\"
fa arrow
\"
></span></a>
\n
"
+
" <a href=
\"\"
ng-click=
\"
multiCheck($index)
\"
>{{v[
0
]}} <span class=
\"
fa arrow
\"
></span></a>
\n
"
+
" <ul class=
\"
nav nav-third-level
\"
collapse=
\"
multiCollapseVar!={{$index}}
\"
>
\n
"
+
" <ul class=
\"
nav nav-third-level
\"
collapse=
\"
multiCollapseVar!={{$index}}
\"
>
\n
"
+
" <li>
\n
"
+
" <li>
\n
"
+
" <a href=
\"
#/{{v[1]}}
\"
>Listele</a>
\n
"
+
" <a href=
\"
#/{{v[1]}}
\"
>Listele</a>
\n
"
+
...
...
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