Commit c05cd1ef authored by Vladimir Baranov's avatar Vladimir Baranov

FIX, rfix#5379. Fix ListNode's dose not respect schema order

parent 4198fb54
...@@ -19,10 +19,8 @@ ...@@ -19,10 +19,8 @@
</label> </label>
</th> </th>
<th scope="row" style="text-align:center">#</th> <th scope="row" style="text-align:center">#</th>
<th ng-repeat="(key,value) in node.items[0] track by $index" <th ng-repeat="propName in node.form" ng-init="prop = node.schema.properties[propName]">
ng-if="key!=='idx' && node.schema.properties[key]"> <span ng-if="!value.verbose_name">{{prop.title||prop.name}}</span>
<span ng-if="value.verbose_name">{{ value.verbose_name }}</span>
<span ng-if="!value.verbose_name">{{node.schema.properties[key]['title']|| key}}</span>
</th> </th>
<th ng-if="meta.allow_actions!==false">İşlem</th> <th ng-if="meta.allow_actions!==false">İşlem</th>
</tr> </tr>
...@@ -44,25 +42,20 @@ ...@@ -44,25 +42,20 @@
</td> </td>
</tr> </tr>
<tr ng-repeat="listnodemodel in node.items track by $index" <tr ng-repeat="listnodemodel in node.items track by $index" ng-init="outerIndex=$index" ng-if="node.schema.formType=='ListNode'">
ng-init="outerIndex=$index"
ng-if="node.schema.formType=='ListNode'">
<td ng-if="meta.allow_selection===true" width="60"> <td ng-if="meta.allow_selection===true" width="60">
<label> <label>
<input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;"> <input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;">
</label> </label>
</td> </td>
<th scope="row" style="text-align:center">{{$index+1}}</th> <th scope="row" style="text-align:center">{{$index+1}}</th>
<td ng-repeat="(k, v) in listnodemodel track by $index" <td ng-repeat="propName in node.form" ng-init="k = propName; v = listnodemodel[propName]; inline = node.schema.inline_edit && node.schema.inline_edit.indexOf(k) > -1">
ng-init="innerIndex=$index" <span ng-if="!inline">{{ v.unicode || v }}</span>
ng-if="k!=='idx' && node.schema.properties[k]">
<span ng-if="!node.schema.inline_edit || node.schema.inline_edit.indexOf(k) < 0">{{ v.unicode || v }}</span>
<!--<input type="{{node.schema.properties[k].type}}"--> <!--<input type="{{node.schema.properties[k].type}}"-->
<!--ng-if="node.schema.inline_edit.indexOf(k) > -1"--> <!--ng-if="node.schema.inline_edit.indexOf(k) > -1"-->
<!--ng-model="node.model[outerIndex][k]"--> <!--ng-model="node.model[outerIndex][k]"-->
<!--ng-change="nodeModelChange(this)">--> <!--ng-change="nodeModelChange(this)">-->
<ng-include src="'components/crud/templates/inline_edit.html'" <ng-include src="'components/crud/templates/inline_edit.html'" ng-if="inline"></ng-include>
ng-if="node.schema.inline_edit.indexOf(k) > -1"></ng-include>
</td> </td>
<td ng-if="meta.allow_actions!==false"> <td ng-if="meta.allow_actions!==false">
<div ng-hide="meta.object_actions.length > 0"> <div ng-hide="meta.object_actions.length > 0">
......
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