Commit f8319f7d authored by Evren Kutar's avatar Evren Kutar

ADD expression to hide / show for actions on left by checking meta has object_actions

rref #5046
REFACTOR refactor if else cases to dynamic dispatch to generate fields
rfix #5152
fixes GH-89
fixes zetaops/ulakbusGH-203
parent b1172c42
...@@ -156,7 +156,7 @@ angular.module('ulakbus.crud', ['schemaForm', 'ulakbus.formService']) ...@@ -156,7 +156,7 @@ angular.module('ulakbus.crud', ['schemaForm', 'ulakbus.formService'])
$scope.$on('reload_cmd', function(event, data){ $scope.$on('reload_cmd', function(event, data){
$scope.reload_cmd = data; $scope.reload_cmd = data;
$scope.reload({}); $scope.reloadCmd();
}); });
// search directive updates objects after search results // search directive updates objects after search results
......
...@@ -12,11 +12,11 @@ ...@@ -12,11 +12,11 @@
<th>İşlem</th> <th>İşlem</th>
</tr> </tr>
<tr ng-if="node.schema.formType=='ListNode'"> <tr ng-if="node.schema.formType=='ListNode'">
<th colspan="2"> <th colspan="2" ng-if="meta.allow_selection===true">
<!--<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;">
<!--Hepsini Seç--> Hepsini Seç
<!--</label>--> </label>
</th> </th>
<th ng-repeat="(key,value) in node.items[0] track by $index" <th ng-repeat="(key,value) in node.items[0] track by $index"
ng-if="key!=='idx' && node.schema.properties[key]"> ng-if="key!=='idx' && node.schema.properties[key]">
...@@ -46,9 +46,9 @@ ...@@ -46,9 +46,9 @@
<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-init="outerIndex=$index"
ng-if="node.schema.formType=='ListNode'"> 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>
...@@ -62,10 +62,16 @@ ...@@ -62,10 +62,16 @@
ng-change="nodeModelChange(this)"> ng-change="nodeModelChange(this)">
</td> </td>
<td ng-if="meta.allow_actions!==false"> <td ng-if="meta.allow_actions!==false">
<button modal-for-nodes="{{node.schema.model_name}},{{node.schema.formType}},edit,{{$index}}">Düzenle <div ng-hide="meta.object_actions.length > 0">
</button> <button modal-for-nodes="{{node.schema.model_name}},{{node.schema.formType}},edit,{{$index}}">
<br> Düzenle
<button ng-click="remove(node, 'ListNode', $index)">Sil</button> </button>
<br>
<button ng-click="remove(node, 'ListNode', $index)">Sil</button>
</div>
<div ng-show="meta.object_actions.length > 0">
<!-- define object actions here -->
</div>
</td> </td>
</tr> </tr>
......
This diff is collapsed.
...@@ -61,9 +61,9 @@ module.exports = function (config) { ...@@ -61,9 +61,9 @@ module.exports = function (config) {
plugins: [ plugins: [
'karma-phantomjs-launcher', 'karma-phantomjs-launcher',
'karma-chrome-launcher', //'karma-chrome-launcher',
'karma-firefox-launcher', //'karma-firefox-launcher',
'karma-safari-launcher', //'karma-safari-launcher',
'karma-jasmine', 'karma-jasmine',
'karma-junit-reporter', 'karma-junit-reporter',
'karma-coverage' 'karma-coverage'
......
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