Switch to an object-based filter attribute

marmelab · Mar 6, 2015 · 4cd8d26 · 4cd8d26
1 parent e71f5b7
commit 4cd8d26
Show file tree

Hide file tree

Showing 7 changed files with 525 additions and 9 deletions.
diff --git a/examples/blog/assets/fonts/FontAwesome.otf b/examples/blog/assets/fonts/FontAwesome.otf
diff --git a/examples/blog/assets/fonts/fontawesome-webfont.eot b/examples/blog/assets/fonts/fontawesome-webfont.eot
diff --git a/examples/blog/assets/fonts/fontawesome-webfont.svg b/examples/blog/assets/fonts/fontawesome-webfont.svg
diff --git a/examples/blog/assets/fonts/fontawesome-webfont.ttf b/examples/blog/assets/fonts/fontawesome-webfont.ttf
diff --git a/examples/blog/assets/fonts/fontawesome-webfont.woff b/examples/blog/assets/fonts/fontawesome-webfont.woff
diff --git a/examples/blog/config.js b/examples/blog/config.js
@@ -115,7 +115,7 @@
                         nga.field('body').label('Comment')
                     ]),
                 nga.field('', 'template').label('')
-                    .template('<span class="pull-right"><ma-filtered-list-button entity-name="comments" filter-name="post_id" filter-value="entry.values.id" text="" size="sm"></ma-filtered-list-button></span>')
+                    .template('<span class="pull-right"><ma-filtered-list-button entity-name="comments" filter="{ post_id: entry.values.id }" size="sm"></ma-filtered-list-button></span>')
             ]);
 
         post.showView() // a showView displays one entry in full page - allows to display more data than in a a list

diff --git a/src/javascripts/ng-admin/Crud/button/maFilteredListButton.js b/src/javascripts/ng-admin/Crud/button/maFilteredListButton.js
@@ -11,8 +11,7 @@ define(function () {
      *     <!-- In a scope where the current entry is a post, link tio the related comments -->
      *     <ma-filtered-list-button 
      *       entity-name="comments"
-     *       filter-name="post_id"
-     *       filter-value="entry.values.id"
+     *       filter="{ post_id: entry.values.id }"
      *       text="See related comments"
      *       size="xs">
      *     </ma-filtered-list-button>')
@@ -21,24 +20,21 @@ define(function () {
      *
      * nga.field('', 'template')
      *   .label('')
-     *   .template('<ma-filtered-list-button entity-name="comments" filter-name="post_id" filter-value="entry.values.id"></ma-filtered-list-button>')
+     *   .template('<ma-filtered-list-button entity-name="comments" filter="{ post_id: entry.values.id }"></ma-filtered-list-button>')
      */
     function maFilteredListButtonDirective($state) {
         return {
             restrict: 'E',
             scope: {
                 entityName: '@',
-                filterName: '@',
-                filterValue: '&',
+                filter: '&',
                 text: '@',
                 size: '@'
             },
             link: function (scope) {
                 scope.buttonText = scope.text || ('See all related ' + scope.entityName);
                 scope.gotoList = function () {
-                    var searchfilter = {};
-                    searchfilter[scope.filterName] = scope.filterValue();
-                    $state.go($state.get('list'), { 'entity': scope.entityName, 'search': searchfilter});
+                    $state.go($state.get('list'), { 'entity': scope.entityName, 'search': scope.filter()});
 
                 };
             },