moksha/api/widgets/grid.py | 14 ++++---------- moksha/public/javascript/ui/moksha.ui.grid.js | 10 ---------- 2 files changed, 4 insertions(+), 20 deletions(-)
New commits: commit 77219cf2498d4b65f744e1eea6060dc418617a91 Author: John (J5) Palmieri johnp@redhat.com Date: Thu Nov 10 13:35:34 2011 -0500
get rid of the params for showing or hiding pagers in the grid
This allowed the widget to control if a pager was shown when it was encountered in the template. In reality it just caused confusion when pagers wouldn't get displayed. If you want to disable a pager either do not define one in the template or add control code there.
diff --git a/moksha/api/widgets/grid.py b/moksha/api/widgets/grid.py index e08ac8e..5facebe 100644 --- a/moksha/api/widgets/grid.py +++ b/moksha/api/widgets/grid.py @@ -71,8 +71,7 @@ class TW1Grid(tw.forms.FormField): params= ['rows_per_page', 'page_num', 'total_rows', 'filters', 'unique_key', 'sort_key', 'sort_order', 'row_template', 'resource', 'resource_path', - 'loading_throbber', 'uid', 'more_link', 'alphaPager', - 'numericPager', 'morePager'] + 'loading_throbber', 'uid', 'more_link'] hidden = True # hide from the moksha main menu
rows_per_page = 10 @@ -87,9 +86,7 @@ class TW1Grid(tw.forms.FormField): resource_path = None loading_throbber = None more_link = None - alphaPager = False - numericPager = False - morePager = False + uid = None
def update_params(self, d): @@ -121,8 +118,7 @@ class TW2Grid(tw2.forms.widgets.FormField): params= ['rows_per_page', 'page_num', 'total_rows', 'filters', 'unique_key', 'sort_key', 'sort_order', 'row_template', 'resource', 'resource_path', - 'loading_throbber', 'uid', 'more_link', 'alphaPager', - 'numericPager'] + 'loading_throbber', 'uid', 'more_link'] hidden = True # hide from the moksha main menu
id = twc.Param(default=None) @@ -137,10 +133,8 @@ class TW2Grid(tw2.forms.widgets.FormField): resource = twc.Param(default=None) resource_path = twc.Param(default=None) loading_throbber = twc.Param(default=None) - more_link = twc.Param(default=None) - alphaPager = twc.Param(default=False) - numericPager = twc.Param(default=False) uid = twc.Param(default=None) + more_link = twc.Param(default=None)
def prepare(self): """ diff --git a/moksha/public/javascript/ui/moksha.ui.grid.js b/moksha/public/javascript/ui/moksha.ui.grid.js index b28d541..b11f59e 100644 --- a/moksha/public/javascript/ui/moksha.ui.grid.js +++ b/moksha/public/javascript/ui/moksha.ui.grid.js @@ -35,10 +35,7 @@ blankRowClass: 'moksha-grid-blank-row', rowClass: 'moksha-grid-row', pagerPageLimit: 5, - alphaPager: false, - numericPager: false, filterControls: false, - morePager: false, more_link: null, loading_throbber: ["Loading", // list of img urls or text "Loading.", @@ -737,9 +734,6 @@ processElement: function($el) { var $grid = $el.data('grid.moksha_grid');
- if (!$grid.options.alphaPager) - return ""; - return this._generate_alpha_pager($grid); },
@@ -793,8 +787,6 @@ processElement: function($el) { var $grid = $el.data('grid.moksha_grid'); var o = $grid.options; - if (!o.numericPager) - return ""
return this._generate_numerical_pager($grid, o.total_rows, @@ -930,8 +922,6 @@ processElement: function($el) { var $grid = $el.data('grid.moksha_grid'); var o = $grid.options; - if (!o.morePager) - return ""
return this._generate_more_pager ($grid, o.total_rows,
moksha-commits@lists.fedorahosted.org