Skip to content

Commit 6f3b877

Browse files
committed
scope in custom field
1 parent 87622bc commit 6f3b877

File tree

4 files changed

+21
-17
lines changed

4 files changed

+21
-17
lines changed

dist/lets.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/controllers/lets-crud-form-modal.controller.js

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,6 @@
99
$scope.data = data || {};
1010
$scope.headers = headers;
1111

12-
var parentScope = headers.parentScope;
13-
delete headers.parentScope;
14-
15-
if(headers.modal_id){
16-
$rootScope.$emit('open:'+headers.modal_id+'', $scope); // @deprecated
17-
18-
if (parentScope){
19-
parentScope.$emit('open:'+headers.modal_id+'', $scope);
20-
}
21-
}
22-
2312
$scope.resource = Restangular.all(headers.route);
2413

2514
for (var y in $scope.headers.fields) {
@@ -53,6 +42,16 @@
5342
$scope.$broadcast('setProgressFile');
5443
});
5544

45+
var parentScope = headers.parentScope;
46+
delete headers.parentScope;
47+
if(headers.modal_id){
48+
$rootScope.$emit('open:'+headers.modal_id+'', $scope); // @deprecated
49+
50+
if (parentScope){
51+
parentScope.$emit('open:'+headers.modal_id+'', $scope);
52+
}
53+
}
54+
5655

5756
});
5857

src/directives/crud/lets-crud-list-table.directive.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,10 @@
399399
$scope.refreshTable(true);
400400
}
401401

402+
$scope.getscope = function(){
403+
return $scope;
404+
}
405+
402406
$scope.$on('refreshGRID', function (event) {
403407
$scope.refreshTable();
404408
});
@@ -473,11 +477,12 @@
473477
return {
474478
scope: {
475479
data: '=',
476-
field: '='
480+
field: '=',
481+
getscope:'='
477482
},
478483
link: function ($scope, $el) {
479484
if( $scope.field.toString && typeof($scope.field.toString)=="function" ){
480-
$el.append($scope.field.toString($scope.data))
485+
$el.append($scope.field.toString($scope.data, $scope.getscope()))
481486
}
482487
}
483488
}

src/views/crud/crud-list-table.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ <h4>{{headers.label}}</h4>
7777
<tr ng-repeat="data in tableData.data">
7878
<td ng-repeat="field in headers.fields | filter: {viewable: true}">
7979
{{parseRecord(data,field)}}
80-
<div ng-if="field.type == 'custom'" data="data" field="field" fw-custom-field></div>
80+
<div ng-if="field.type=='custom'" data="data" field="field" getscope="getscope" fw-custom-field></div>
8181
</td>
8282
<td class="text-right btn-column" ng-if="headers.settings.edit || headers.settings.delete">
8383
<div class="btn-group" role="group">

0 commit comments

Comments
 (0)