Commit 2338807e authored by Evren Kutar's avatar Evren Kutar

v0.0.3.1 model_name fix for linked model

parent f03ce80a
...@@ -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>
......
...@@ -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.title] = childmodel.model; scope.$parent.model[childmodel.schema.model_name] = 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.title].push(childmodel.model); scope.$parent.model[childmodel.schema.model_name].push(childmodel.model);
} }
childmodel.lengthModels += 1; childmodel.lengthModels += 1;
}); });
......
This diff is collapsed.
...@@ -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" +
......
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