Skip to content

Commit 7007317

Browse files
committed
fix fieldset root and inside another fieldset conflict, fix scripts and helpers
1 parent 34716f8 commit 7007317

File tree

14 files changed

+79
-3263
lines changed

14 files changed

+79
-3263
lines changed

src/Model/template/_scripts.html

+16-11
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//get the reindex name
99
var reindex = target.parent().parent().data('reindex');
1010
//get the template
11-
var template = $('#fieldset-template-' + fieldset).html();
11+
var template = $('script#fieldset-template-' + fieldset).html();
1212

1313
//collect parents
1414
var parents = [];
@@ -19,7 +19,7 @@
1919
var name = parent.data('reindex');
2020

2121
//fieldset? and has a reindex name?
22-
if (type === 'FIELDSET' && name && name) {
22+
if (type === 'FIELDSET' && name) {
2323
var index = element.index() - 1;
2424
//get the current element index from parent
2525
parents.push({
@@ -40,19 +40,24 @@
4040
parents = parents.reverse();
4141

4242
console.log(parents);
43+
44+
//root name
45+
var root = '';
4346

44-
//replace indexes based off of parents
47+
//based on parents let's determine
48+
// the root name root1[index][root2][index]
4549
for(var i in parents) {
46-
var index = parseInt(i) + 1;
47-
var namespace = '{ROOT_' + index + '}';
48-
var re = new RegExp(namespace, 'g');
49-
template = template.replace(re, parents[i].index);
50-
51-
namespace = 'ROOT_' + index;
52-
re = new RegExp(namespace, 'g');
53-
template = template.replace(re, parents[i].name);
50+
if (i == 0) {
51+
root += parents[i].name + '[' + parents[i].index + ']';
52+
continue;
53+
}
54+
55+
root += '[' + parents[i].name + '][' + parents[i].index + ']';
5456
}
5557

58+
//replace all root template
59+
template = template.replace(new RegExp('{ROOT}', 'g'), root);
60+
5661
//insert and activate scripts
5762
$(template).insertBefore(target.parent()).doon();
5863
});

src/Model/template/form.html

+3-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,9 @@ <h3 class="main-title">
169169
{{/relations}}
170170

171171
{{#format 'field' schema.name item}}
172-
{{> form_set}}
172+
{{#each formats}}
173+
{{> form_set}}
174+
{{/each}}
173175

174176
{{{partial 'form_set-template' templates}}}
175177
{{/format}}

0 commit comments

Comments
 (0)