Merge pull request #380 from marmelab/batch_actions_config

[RFR] Batch actions config
marmelab · Apr 2, 2015 · 5ee3013 · 5ee3013
2 parents 94fdf1d + ab1ff08
commit 5ee3013
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/build/ng-admin.min.js b/build/ng-admin.min.js
diff --git a/build/ng-admin.min.map b/build/ng-admin.min.map
diff --git a/src/javascripts/ng-admin/Crud/misc/ViewBatchActions.js b/src/javascripts/ng-admin/Crud/misc/ViewBatchActions.js
@@ -10,15 +10,13 @@ define(function (require) {
 
         return {
             restrict: 'E',
-            transclude: true,
             scope: {
                 'entity': '=',
                 'selection': '=',
                 'buttons': '&'
             },
             template: viewActionsTemplate,
             link: function(scope) {
-
                 scope.isopen = false;
 
                 scope.toggleDropdown = function($event) {

diff --git a/src/javascripts/ng-admin/Crud/misc/view-actions.html b/src/javascripts/ng-admin/Crud/misc/view-actions.html
@@ -1,4 +1,5 @@
 <span ng-repeat="button in buttons" ng-switch="button" class="view_actions">
+    <ma-view-batch-actions ng-switch-when="batch" buttons="batchButtons()" selection="selection" entity="entity"></ma-view-batch-actions>
     <ma-back-button ng-switch-when="back"></ma-back-button>
     <ma-list-button ng-switch-when="list" entity="entity"></ma-list-button>
     <ma-create-button ng-switch-when="create" entity="entity"></ma-create-button>