Skip to content

U
ulakbus-ui
Commit cbe72bc0 authored by Vladimir Baranov's avatar Vladimir Baranov
Browse files
Options

Remove merge info

parent 52fe1bb5
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 8 deletions
app/components/crud/templates/nodeTable.html
View file @ cbe72bc0
......@@ -19,11 +19,7 @@
</label>
</th>
<th scope="row" style="text-align:center">#</th>
<<<<<<< 6a71c6920efc5235eff71bf42763b82cc30f1827
<th ng-repeat="prop in node.schema.properties_list">
=======
<th ng-repeat="propName in node.form" ng-init="prop = node.schema.properties[propName]">
>>>>>>> FIX, rfix#5379. Fix ListNode's dose not respect schema order
<span ng-if="!value.verbose_name">{{prop.title||prop.name}}</span>
</th>
<th ng-if="meta.allow_actions!==false">İşlem</th>
......
dist/templates.js
View file @ cbe72bc0
......@@ -379,11 +379,7 @@ angular.module("components/crud/templates/nodeTable.html", []).run(["$templateCa
" </label>\n" +
" </th>\n" +
" <th scope=\"row\" style=\"text-align:center\">#</th>\n" +
"<<<<<<< 6a71c6920efc5235eff71bf42763b82cc30f1827\n" +
" <th ng-repeat=\"prop in node.schema.properties_list\">\n" +
"=======\n" +
" <th ng-repeat=\"propName in node.form\" ng-init=\"prop = node.schema.properties[propName]\">\n" +
">>>>>>> FIX, rfix#5379. Fix ListNode's dose not respect schema order\n" +
" <span ng-if=\"!value.verbose_name\">{{prop.title||prop.name}}</span>\n" +
" </th>\n" +
" <th ng-if=\"meta.allow_actions!==false\">İşlem</th>\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