Moksha-commits May 2009

moksha-commits@lists.fedorahosted.org

3 participants
46 discussions

moksha/public
by John (J5) Palmieri 18 May '09

18 May '09

moksha/public/javascript/ui/moksha.ui.tabs.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) New commits: commit bad18a7b73c7df3175670944c0ebf77656c6e85a Author: John (J5) Palmieri <johnp(a)redhat.com> Date: Mon May 18 17:08:41 2009 -0400 fail whale redirect * redirect to a failure page when a hash requested tab can not be found * fix hashToIndex to return the first tab if the hash path elements are less than the number of nested nav elements (e.g. you can specify the full path of /package_maintanance/all_packages or simply /package_maintanance. Both are valid paths.) diff --git a/moksha/public/javascript/ui/moksha.ui.tabs.js b/moksha/public/javascript/ui/moksha.ui.tabs.js index bc3575c..10ad65a 100644 --- a/moksha/public/javascript/ui/moksha.ui.tabs.js +++ b/moksha/public/javascript/ui/moksha.ui.tabs.js @@ -1,16 +1,16 @@ // This file is part of Moksha. // Copyright (C) 2008-2009 Red Hat, Inc. -// +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as // published by the Free Software Foundation, either version 3 of the // License, or (at your option) any later version. -// +// // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU Affero General Public License for more details. -// +// // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see <http://www.gnu.org/licenses/>. @@ -217,6 +217,10 @@ $.widget("ui.mokshatabs", { }, 500); } scrollTo(0, 0); + } else { + // invalid path, redirect to /invalid_path + path = location.hash.substring(1); + location.href=moksha.url('/invalid_path', {invalid_path: path}); } } @@ -579,7 +583,7 @@ $.widget("ui.mokshatabs", { var id_index = level + offset; if (id_index >= hash.length) - return -1; + return 0; var id = "#" + hash[level + offset];

1 0

moksha/public
by John (J5) Palmieri 18 May '09

18 May '09

moksha/public/javascript/moksha.extensions.js | 32 +++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) New commits: commit 57a0c6ed92d3a447780615794e6613567d3a7ca9 Author: John (J5) Palmieri <johnp(a)redhat.com> Date: Mon May 18 14:33:49 2009 -0400 fix some bugs in extension point javascript * when something fails continue to the next item instead of returning from the method * print out the error to the console if an extension point fails * create a new div for each extension point. We were mistakenly using the same div diff --git a/moksha/public/javascript/moksha.extensions.js b/moksha/public/javascript/moksha.extensions.js index 7972956..f805913 100644 --- a/moksha/public/javascript/moksha.extensions.js +++ b/moksha/public/javascript/moksha.extensions.js @@ -1,16 +1,16 @@ // This file is part of Moksha. // Copyright (C) 2008-2009 Red Hat, Inc. -// +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as // published by the Free Software Foundation, either version 3 of the // License, or (at your option) any later version. -// +// // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU Affero General Public License for more details. -// +// // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see <http://www.gnu.org/licenses/>. @@ -69,18 +69,14 @@ _extensions.prototype = { var append_div = jQuery("#" + data.placeholder_id); - var block_element; - if (append_div.is('ul') || - append_div.is('ol')) - { + for(var i = 0; i < obj_list.length; i++) { + var block_element; + if (append_div.is('ul') || + append_div.is('ol')) { block_element = jQuery('<li/>') - } - else - { + } else { block_element = jQuery('<div/>') } - - for(var i = 0; i < obj_list.length; i++) { //clone our data and generate our uid so we are unique var d = new moksha.shallow_clone(data); d.uid = "extension_" + this.get_uid(); @@ -94,11 +90,15 @@ _extensions.prototype = { d.overlay = overlay; //run the script and parse in the results - var result = obj_list[i].run(d); - if (!result) - { - return; + try { + var result = obj_list[i].run(d); + if (!result) { + result = ''; } + } catch (error) { + moksha.error('Extension Point Error (' + data.type + '): ' + error.toString()); + continue; + } div.append(result);

1 0

moksha/public
by John (J5) Palmieri 15 May '09

15 May '09

moksha/public/javascript/ui/moksha.ui.grid.js | 60 +++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) New commits: commit cd26a75dabfd451406d5ba6df13a95f643e0f4cc Author: John (J5) Palmieri <johnp(a)redhat.com> Date: Thu May 14 20:21:36 2009 -0400 enhanced numeric pager for the grid shows start, end and page jumping elipses diff --git a/moksha/public/javascript/ui/moksha.ui.grid.js b/moksha/public/javascript/ui/moksha.ui.grid.js index a5ac46f..5a1251b 100644 --- a/moksha/public/javascript/ui/moksha.ui.grid.js +++ b/moksha/public/javascript/ui/moksha.ui.grid.js @@ -543,7 +543,7 @@ resource_path: null, blankRowClass: 'moksha-grid-blank-row', rowClass: 'moksha-grid-row', - pagerPageLimit: 10, + pagerPageLimit: 5, alphaPager: false, numericPager: false, filterControls: false, @@ -760,6 +760,10 @@ var curr_page = parseInt((start_row + 0.5) / rows_per_page) + 1; var next_page = curr_page + 1; + var prev_page = curr_page -1; + var next_elipse = curr_page + o.pagerPageLimit; + var prev_elipse = curr_page - o.pagerPageLimit; + var pager = $('<ul />'); var goto_page = function() { @@ -773,6 +777,38 @@ if (num_next_left < show_next) show_prev += (show_next - num_next_left) + // previous link + var page = $("<li>Prev</li>").addClass('page-button').addClass('prev-page'); + if (curr_page != 1) { + var page_link = $('<a href="javascript:void(0)"></a>').html('Prev'); + page_link.data('page.moksha_grid', prev_page); + page_link.click(goto_page); + page.html(page_link); + } + + pager.append(page); + + // elipsised page jumper + if (curr_page - show_prev > 0) { + // first page link + var page = $('<li></li>').addClass('page-button'); + page_link = $('<a href="javascript:void(0)"></a>').html('1'); + page_link.data('page.moksha_grid', 1); + page_link.click(goto_page); + page.html(page_link); + pager.append(page); + + // elipse link + var page = $('<li>...</li>').addClass('page-button'); + if (prev_elipse > 1) { + page_link = $('<a href="javascript:void(0)"></a>').html('...'); + page_link.data('page.moksha_grid', prev_elipse); + page_link.click(goto_page); + page.html(page_link); + } + pager.append(page); + } + var page_list = []; var i, j; for (i = curr_page, j = 0; i > 0 && j < show_prev; i--, j++) @@ -800,6 +836,28 @@ pager.append(page); } + // elipsised page jumper + if (curr_page + show_next < total_pages) { + // elipse link + var page = $('<li>...</li>').addClass('page-button'); + if (next_elipse < total_pages) { + page_link = $('<a href="javascript:void(0)"></a>').html('...'); + page_link.data('page.moksha_grid', next_elipse); + page_link.click(goto_page); + page.html(page_link); + } + pager.append(page); + + // last page link + var page = $('<li></li>').addClass('page-button'); + page_link = $('<a href="javascript:void(0)"></a>').html(total_pages); + page_link.data('page.moksha_grid', total_pages); + page_link.click(goto_page); + page.html(page_link); + pager.append(page); + + } + var page = $("<li>Next</li>").addClass('page-button').addClass('next-page'); if (curr_page < total_pages) { var page_link = $('<a href="javascript:void(0)"></a>').html('Next');

1 0

moksha/lib
by Luke Macken 13 May '09

13 May '09

moksha/lib/helpers.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) New commits: commit 69e9107b41c483b7d636d2dd1f3f59af76d153bb Author: Luke Macken <lmacken(a)redhat.com> Date: Wed May 13 10:14:29 2009 -0400 More DateTimeDisplay tweaks diff --git a/moksha/lib/helpers.py b/moksha/lib/helpers.py index 5177e02..70954a4 100644 --- a/moksha/lib/helpers.py +++ b/moksha/lib/helpers.py @@ -934,8 +934,8 @@ class DateTimeDisplay(object): '1 day' >>> d.age(datetime(2010, 7, 10, 10, 10), granularity='minute') '1 year, 1 month, 29 days, 10 hours and 10 minutes' - >>> d.age(tz='US/Eastern') - '1 day and 11 hours' + >>> d.age(datetime(2010, 7, 10, 10, 10), tz='Europe/Amsterdam') + '1 year, 1 month, 29 days and 10 hours' >>> d = DateTimeDisplay(datetime(2009, 5, 12, 12, 0, 0)) >>> d.timestamp datetime.datetime(2009, 5, 12, 12, 0) @@ -968,13 +968,12 @@ class DateTimeDisplay(object): """ start = self.datetime if not end: - if tz: - tz = timezone(tz) - end = datetime.now(utc) - end = end.astimezone(tz) - start = self.datetime.replace(tzinfo=utc) - start = tz.normalize(start.astimezone(tz)) - else: - end = datetime.utcnow() + end = datetime.utcnow() + if tz: + zone = timezone(tz) + #end = zone.localize(end) + end = end.replace(tzinfo=utc) + end = zone.normalize(end.astimezone(zone)) + start = self.astimezone(tz) return distance_of_time_in_words(start, end, granularity=granularity)

1 0

moksha/lib
by Luke Macken 13 May '09

13 May '09

moksha/lib/helpers.py | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) New commits: commit 172d4fbb2e6a196293b0ba93022fe2ab9e794cd6 Author: Luke Macken <lmacken(a)redhat.com> Date: Wed May 13 07:35:16 2009 -0400 DateTimeDisplay improvements. - Added an 'astimezone' method to convert to a given timezone - I also added some more test cases, although I'm not 100% sure that they are entirely correct. diff --git a/moksha/lib/helpers.py b/moksha/lib/helpers.py index 120cdb6..5177e02 100644 --- a/moksha/lib/helpers.py +++ b/moksha/lib/helpers.py @@ -934,6 +934,13 @@ class DateTimeDisplay(object): '1 day' >>> d.age(datetime(2010, 7, 10, 10, 10), granularity='minute') '1 year, 1 month, 29 days, 10 hours and 10 minutes' + >>> d.age(tz='US/Eastern') + '1 day and 11 hours' + >>> d = DateTimeDisplay(datetime(2009, 5, 12, 12, 0, 0)) + >>> d.timestamp + datetime.datetime(2009, 5, 12, 12, 0) + >>> d.astimezone('Europe/Amsterdam') + datetime.datetime(2009, 5, 12, 14, 0, tzinfo=<DstTzInfo 'Europe/Amsterdam' CEST+2:00:00 DST>) """ def __init__(self, timestamp, format='%Y-%m-%d %H:%M:%S'): @@ -949,16 +956,25 @@ class DateTimeDisplay(object): raise Exception("You must provide either a datetime object or a" "string, not %s" % type(timestamp)) + def astimezone(self, tz): + """ Return `self.datetime` as a different timezone """ + timestamp = self.datetime.replace(tzinfo=utc) + zone = timezone(tz) + return zone.normalize(timestamp.astimezone(zone)) + def age(self, end=None, tz=None, granularity='hour'): """ Return the distance of time in words from `self.datetime` to `end`. """ + start = self.datetime if not end: if tz: + tz = timezone(tz) end = datetime.now(utc) - end = end.astimezone(timezone(tz)) + end = end.astimezone(tz) + start = self.datetime.replace(tzinfo=utc) + start = tz.normalize(start.astimezone(tz)) else: end = datetime.utcnow() - return distance_of_time_in_words(self.datetime, end, - granularity=granularity) + return distance_of_time_in_words(start, end, granularity=granularity)

1 0

5 commits - moksha/connector moksha/lib
by Luke Macken 13 May '09

13 May '09

moksha/connector/utils.py | 17 +++++--- moksha/lib/helpers.py | 92 ++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 91 insertions(+), 18 deletions(-) New commits: commit f3465b6479cffa3eb2185e9945945f610961baac Author: Luke Macken <lmacken(a)redhat.com> Date: Wed May 13 06:45:07 2009 -0400 Add a deprecation warning to the moksha.connector.utils.DateTimeDisplay object diff --git a/moksha/connector/utils.py b/moksha/connector/utils.py index 91895ad..168b9de 100644 --- a/moksha/connector/utils.py +++ b/moksha/connector/utils.py @@ -16,17 +16,22 @@ # # Authors: John (J5) Palmieri <johnp(a)redhat.com> -from datetime import datetime -from UserDict import DictMixin - import time import bisect +import warnings + +from datetime import datetime +from UserDict import DictMixin class DateTimeDisplay(object): """DateTimeDisplay is an object which takes any number of datetime objects and process them for display. """ def __init__(self, *datetime_args): + warnings.warn("moksha.connectors.utils.DateTimeDisplay has been " + "deprecated, use moksha.lib.helpers.DateTimeDisplay " + "instead.", DeprecationWarning) + # All dates are sorted from latest to earliest self._datetime_ordered_list = [] for dt in datetime_args: diff --git a/moksha/lib/helpers.py b/moksha/lib/helpers.py index a78a0c6..120cdb6 100644 --- a/moksha/lib/helpers.py +++ b/moksha/lib/helpers.py @@ -920,6 +920,7 @@ def utc_offset(tz): # utc_offset += '.%d' % ... return utc_offset + class DateTimeDisplay(object): """ DateTimeDisplay is an object which takes any number of datetime objects commit c717becf37f6b47367158ed9ebfed31386ebf2bf Author: Luke Macken <lmacken(a)redhat.com> Date: Wed May 13 06:37:53 2009 -0400 Clean up our helpers module, and add a new DateTimeDisplay object. diff --git a/moksha/lib/helpers.py b/moksha/lib/helpers.py index 6913f14..a78a0c6 100644 --- a/moksha/lib/helpers.py +++ b/moksha/lib/helpers.py @@ -14,18 +14,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from webhelpers import date, feedgenerator, html, number, misc, text - -from repoze.what.predicates import (Not, Predicate, All, Any, has_all_permissions, - has_any_permission, has_permission, - in_all_groups, in_any_group, in_group, - is_user, not_anonymous) - -from repoze.what.authorize import check_authorization, NotAuthorizedError - -from webob import Request - +import moksha import copy +import time import pylons import urllib import uuid @@ -34,9 +25,20 @@ import re import os import logging +from pytz import timezone, utc from webob import Request from decorator import decorator -import moksha +from datetime import datetime +from webhelpers import date, feedgenerator, html, number, misc, text +from webhelpers.date import distance_of_time_in_words +from repoze.what.authorize import check_authorization, NotAuthorizedError +from repoze.what.predicates import (Not, Predicate, All, Any, + has_all_permissions, has_any_permission, + has_permission, in_all_groups, + in_any_group, in_group, is_user, + not_anonymous) + +from moksha.exc import MokshaConfigNotFound log = logging.getLogger(__name__) scrub_filter = re.compile('[^_a-zA-Z0-9-]') @@ -896,8 +898,13 @@ def strip_script(environ): return path -def utc_offset(cls, tz): - """ Return the UTC offset for a given timezone """ +def utc_offset(tz): + """ Return the UTC offset for a given timezone. + + >>> utc_offset('US/Eastern') + '-4' + + """ utc_offset = '' now = datetime.now(utc) now = now.astimezone(timezone(tz)) @@ -912,3 +919,45 @@ def utc_offset(cls, tz): #if minutes: # utc_offset += '.%d' % ... return utc_offset + +class DateTimeDisplay(object): + """ + DateTimeDisplay is an object which takes any number of datetime objects + and process them for display:: + + >>> from datetime import datetime + >>> now = datetime(2009, 5, 12) + >>> later = datetime(2009, 5, 13) + >>> d = DateTimeDisplay(now) + >>> d.age(later) + '1 day' + >>> d.age(datetime(2010, 7, 10, 10, 10), granularity='minute') + '1 year, 1 month, 29 days, 10 hours and 10 minutes' + + """ + def __init__(self, timestamp, format='%Y-%m-%d %H:%M:%S'): + self.timestamp = timestamp + if isinstance(timestamp, datetime): + self.datetime = timestamp + elif isinstance(timestamp, basestring): + if hasattr(datetime, 'strptime'): # Python 2.5+ + self.datetime = datetime.strptime(timestamp, format) + else: # Python 2.4 + self.datetime = datetime(*time.strptime(timestamp, format)[:-2]) + else: + raise Exception("You must provide either a datetime object or a" + "string, not %s" % type(timestamp)) + + def age(self, end=None, tz=None, granularity='hour'): + """ + Return the distance of time in words from `self.datetime` to `end`. + """ + if not end: + if tz: + end = datetime.now(utc) + end = end.astimezone(timezone(tz)) + else: + end = datetime.utcnow() + + return distance_of_time_in_words(self.datetime, end, + granularity=granularity) commit e03eafc95554318b8acca957a9555328a8cf053d Author: Luke Macken <lmacken(a)redhat.com> Date: Wed May 13 06:30:06 2009 -0400 Add a utc_offset method to moksha.lib.helpers diff --git a/moksha/lib/helpers.py b/moksha/lib/helpers.py index 40ca0d8..6913f14 100644 --- a/moksha/lib/helpers.py +++ b/moksha/lib/helpers.py @@ -894,3 +894,21 @@ def strip_script(environ): if path.startswith(prefix): path = path[len(prefix):] return path + + +def utc_offset(cls, tz): + """ Return the UTC offset for a given timezone """ + utc_offset = '' + now = datetime.now(utc) + now = now.astimezone(timezone(tz)) + offset = now.strftime('%z') + if offset.startswith('-'): + offset = offset[1:] + utc_offset += '-' + hours = int(offset[:2]) + utc_offset += str(hours) + # FIXME: account for minutes? + #minutes = int(offset[2:]) + #if minutes: + # utc_offset += '.%d' % ... + return utc_offset commit 12da5287a37613862e2ec6e2fe7e67b3a3bd7981 Merge: d22b992... 016266e... Author: Luke Macken <lmacken(a)redhat.com> Date: Tue May 12 15:47:53 2009 -0400 Merge branch 'master' of git+ssh://git.fedorahosted.org/git/moksha commit d22b99237f6647bf416d34b1fa84c351714e39f6 Author: Luke Macken <lmacken(a)redhat.com> Date: Tue May 12 15:47:49 2009 -0400 Fix broken tabbing diff --git a/moksha/connector/utils.py b/moksha/connector/utils.py index 0de0b90..91895ad 100644 --- a/moksha/connector/utils.py +++ b/moksha/connector/utils.py @@ -260,9 +260,9 @@ class WeightedSearch(object): HEAVY_WEIGHT = 100 def __init__(self, search_func, cols, cache=None): - self.search_func = search_func - self.cache = cache - self.cols = cols + self.search_func = search_func + self.cache = cache + self.cols = cols def weigh(self, search_term, weighted_item): search_term_len = len(search_term)

1 0

2 commits - moksha/lib moksha/public
by John (J5) Palmieri 12 May '09

12 May '09

moksha/lib/helpers.py | 7 ++++-- moksha/public/javascript/ui/moksha.ui.grid.js | 28 +++++++++++++++++++++++--- 2 files changed, 30 insertions(+), 5 deletions(-) New commits: commit 016266e40f507453ec52f1c7e28403679d3b8609 Author: John (J5) Palmieri <johnp(a)redhat.com> Date: Tue May 12 16:29:30 2009 -0400 allow the conditionals to refrence the same variables as the templates in grids * make the options dictionary members into local variables so they can be refrenced like total_rows instead of options.total_rows * the templates already did this so this just makes the two line up better * options. can still be refrenced diff --git a/moksha/public/javascript/ui/moksha.ui.grid.js b/moksha/public/javascript/ui/moksha.ui.grid.js index 569030e..a5ac46f 100644 --- a/moksha/public/javascript/ui/moksha.ui.grid.js +++ b/moksha/public/javascript/ui/moksha.ui.grid.js @@ -222,9 +222,31 @@ var if_attr = $(this).attr('if'); // always return true for elements without a conditional var result = true; - if (if_attr) - // return the results of the conditional - result = eval(if_attr); + if (if_attr) { + + // contain this in a function block to contain variables + // which is executed immediately + (function() { + // turn the dictionary members into variable local to this + // function block + for(key in options) { + var eval_line = 'var ' + key + '='; + var value = options[key]; + + try { + eval_line += $.toJSON(value); + } catch(err) { + continue; + } + eval(eval_line); + value = '' + eval_line = ''; + } + + // return the results of the conditional + result = eval(if_attr); + })(); + } if (!result) $(this).hide(); commit 9af6bf65bbc273f5d6d1bf16c05d93824ecb2b66 Author: John (J5) Palmieri <johnp(a)redhat.com> Date: Tue May 12 16:28:43 2009 -0400 allow changing the label when cloning a wrapper diff --git a/moksha/lib/helpers.py b/moksha/lib/helpers.py index 757c8b7..40ca0d8 100644 --- a/moksha/lib/helpers.py +++ b/moksha/lib/helpers.py @@ -255,7 +255,7 @@ class App(ConfigWrapper): if self.label and not self.content_id: self.content_id = scrub_filter.sub('_', self.label.lower()) - def clone(self, update_params=None, auth=None, content_id=None): + def clone(self, update_params=None, auth=None, content_id=None, label=None): if not update_params: update_params = {} @@ -269,7 +269,10 @@ class App(ConfigWrapper): if content_id == None: content_id == self.content_id - return App(label=self.label, + if label == None: + label = self.label + + return App(label=label, url=self.url, params=params, auth=auth,

1 0

moksha/public
by John (J5) Palmieri 11 May '09

11 May '09

moksha/public/javascript/moksha.js | 35 +++++++++ moksha/public/javascript/ui/moksha.ui.grid.js | 92 ++++++++------------------ 2 files changed, 64 insertions(+), 63 deletions(-) New commits: commit 1ba6791203e16590d1b51b1639742c1064f8158d Author: John (J5) Palmieri <johnp(a)redhat.com> Date: Mon May 11 17:05:23 2009 -0400 add defer method for defering ui updates and some performance tweaks to the grid diff --git a/moksha/public/javascript/moksha.js b/moksha/public/javascript/moksha.js index c2b749a..cc4fa96 100644 --- a/moksha/public/javascript/moksha.js +++ b/moksha/public/javascript/moksha.js @@ -29,6 +29,8 @@ if (!(typeof(moksha) === 'undefined')) var _moksha_resource_cache = {'scripts':{}, 'links':{}}; +var _moksha_deferred = []; + var _moksha_init = false; // preload cache @@ -686,6 +688,39 @@ moksha = { } return purl.toString(); + }, + + /*********************************************************** + * Defers execution of a function so we don't block the UI. + * The function is placed in a stack and a timer is started + * Every time the timer goes off a function is popped off the + * stack and executed. + * + * scope - what the "this" variable evaluates to when the + * function is called + * func - the function to be executed. return values are + * ignored + * args - a list of arguments to pass to the function + ************************************************************/ + defer: function(scope, func, args) { + var defer_time = 1; // ms + var timeout = function () { + var closure = _moksha_deferred.shift(); + var self = closure[0]; + var f = closure[1]; + var args = closure[2]; + if (!args) + args = []; + + f.apply(self, args); + if (_moksha_deferred.length > 0) + setTimeout(timeout, defer_time); + } + + _moksha_deferred.push([scope, func, args]); + + if (_moksha_deferred.length == 1) + setTimeout(timeout, defer_time); } } diff --git a/moksha/public/javascript/ui/moksha.ui.grid.js b/moksha/public/javascript/ui/moksha.ui.grid.js index cf45958..569030e 100644 --- a/moksha/public/javascript/ui/moksha.ui.grid.js +++ b/moksha/public/javascript/ui/moksha.ui.grid.js @@ -59,26 +59,14 @@ var o = self.options; var $ph = self.$rowplaceholder; - /* - var $rows = $('.' + o.rowClass, $ph.parent()); - - for (j=0; j < $rows.length; j++) { - var $blank = $(self._blank_row).addClass(o.rowClass + '_' + j.toString()); - $($rows[j]).replaceWith($blank); - } - - for (i=j; i<o.rows_per_page; i++) { - var $blank = $(self._blank_row).addClass(o.rowClass + '_' + i.toString()); - $ph.before($blank); - }*/ - $('.' + o.rowClass, self.element).replaceWith(''); + o.visible_rows = 0; }, insert_row: function(i, row_data) { var self = this; var o = self.options - var row_count = self.visible_row_count(); + var row_count = o.visible_rows // store the widget for this element jQuery.data(self.element, 'mokshagrid', self); @@ -96,30 +84,28 @@ var row_class = o.rowClass + '_' + row_count.toString(); $ph.parent().append($new_row); $new_row.addClass(row_class).addClass(o.rowClass); + o.visible_rows++; } else { // insert before i element and update all row numbers - // if it is a blank row, replace the row var row_class = o.rowClass + '_' + i.toString(); var $row = $('.' + row_class, $ph.parent()); $new_row.addClass(row_class).add_class(o.rowClass); - if($row.hasClass(o.blankRowClass)) { - $row.replaceWith(new_row); - } else { - var $current_rows = $(o.rowClass, $ph.parent()); - for (j = i; j < $current_rows.length; j++) { - var k = j + 1; - var old_class = '.' + o.rowClass + '_' + j.toString(); - var new_class = '.' + o.rowClass + '_' + k.toString(); - $current_rows[j].removeClass(old_class); - $current_rows[j].addClass(new_class); - - } + var $current_rows = $(o.rowClass, $ph.parent()); + for (j = i; j < $current_rows.length; j++) { + var k = j + 1; + var old_class = '.' + o.rowClass + '_' + j.toString(); + var new_class = '.' + o.rowClass + '_' + k.toString(); + $current_rows[j].removeClass(old_class); + $current_rows[j].addClass(new_class); + } - $row.before($new_row); + $row.before($new_row); - if (row_count == o.rows_per_page) - self.remove_row(o.rows_per_page); + o.visible_rows++; + if (row_count == o.rows_per_page) { + o.visible_rows = o.rows_per_page; + self.remove_row(o.rows_per_page); } } @@ -140,7 +126,13 @@ var o = self.options; var $ph = self.$rowplaceholder; var $rows = $(row_class, $ph.parent()); - $rows[i].replaceWith(''); + var $r = $rows[i]; + + if ($r.length) { + replaceWith(''); + if (i < o.rows_per_page) + o.visible_rows--; + } //FIXME: We need to relabel rows if this is not the // end of the rows @@ -326,34 +318,18 @@ self.clear(); for (var i in json.rows) { - self.append_row(json.rows[i]); + var row = json.rows[i]; + moksha.defer(self, self.append_row, [row]); } - // reset based on returned values o.total_rows = json.total_rows; o.start_row = json.start_row; o.rows_per_pager = json.rows_per_page; - self._process_controls(); - - var vr = self.visible_row_count(); - - /* msg block - var msg = ''; - - var show_range = vr.toString(); - // show an actual range if we are not starting from 0 - if (sr > 0) - show_range = sr.toString() + '-' + (sr + vr).toString(); - - - msg = 'Viewing ' + show_range + ' of ' + tr.toString(); - msg += ' items.'; - - $('.message', self.$pager_bottom_placeholder).html(msg); - - */ + moksha.defer(self, function() { + self._process_controls(); + }); } var dispatch_data = {} @@ -392,17 +368,7 @@ visible_row_count: function() { var self = this; var o = self.options; - var $ph = self.$rowplaceholder; - var $rows = $('.' + o.rowClass, $ph.parent()); - - for (i=$rows.length; i > 0; i--) { - if (!$($rows[i-1]).hasClass(o.blankRowClass)) { - o.visible_rows = i + 1; - return i; - } - } - - return 0; + return o.visible_rows; }, /* Private */

1 0

moksha/public
by John (J5) Palmieri 11 May '09

11 May '09

moksha/public/javascript/ui/moksha.ui.grid.js | 33 ++++++++++++++++++++------ 1 file changed, 26 insertions(+), 7 deletions(-) New commits: commit 38ece5c1dc3600b128c2874351ebbb720b871645 Author: John (J5) Palmieri <johnp(a)redhat.com> Date: Mon May 11 15:21:31 2009 -0400 add the conditional 'if' attribute to moksha-controls elements diff --git a/moksha/public/javascript/ui/moksha.ui.grid.js b/moksha/public/javascript/ui/moksha.ui.grid.js index fa4f2a1..cf45958 100644 --- a/moksha/public/javascript/ui/moksha.ui.grid.js +++ b/moksha/public/javascript/ui/moksha.ui.grid.js @@ -222,11 +222,30 @@ self.request_data_refresh(); }, - _foreach_controls: function(callback) { - var self = this; + _foreach_controls: function(callback, eval_conditional) { + var options = this.options; + + // get our controls if conditional is true + var _filter_conditional = function(i) { + var if_attr = $(this).attr('if'); + // always return true for elements without a conditional + var result = true; + if (if_attr) + // return the results of the conditional + result = eval(if_attr); + + if (!result) + $(this).hide(); + else + $(this).show(); + + return result; + } - // get our controls - var $controls = self._control_list; + var self = this; + var $contols = self.$_control_list; + if (eval_conditional) + $controls = self.$_control_list.filter(_filter_conditional); // iterate through all of our control plugins // and get any id that matches @@ -241,8 +260,8 @@ _init_controls: function() { var self = this; - $controls = $('#grid-controls', this.element.parent()); - self._control_list = $controls; + $controls = $('#grid-controls', this.element.parent()).hide(); + self.$_control_list = $controls; $.each($controls, function(i, c) { var $c = $(c); @@ -293,7 +312,7 @@ $(c).html(results); } - this._foreach_controls(f); + this._foreach_controls(f, true); }, refresh_data: function(event, search_criteria) {

1 0

moksha/api moksha/tests moksha/wsgiapp.py
by Luke Macken 11 May '09

11 May '09

moksha/api/widgets/feed/feed.py | 4 ++-- moksha/tests/test_feed.py | 2 +- moksha/wsgiapp.py | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) New commits: commit 35a2ddeb258d9d222d7d4f350fe0d2928c60b515 Author: Luke Macken <lmacken(a)redhat.com> Date: Mon May 11 10:03:47 2009 -0400 Rename the Feed.entries method to Feed.get_entries. The latest tip of ToscaWidgets will no longer work with this Widget, because it has a method with the same name as a `param`. TW sees that Feed.entries is callable without any arguments, so it tries to do so when rendering the widget. diff --git a/moksha/api/widgets/feed/feed.py b/moksha/api/widgets/feed/feed.py index 72eb88b..7044eee 100644 --- a/moksha/api/widgets/feed/feed.py +++ b/moksha/api/widgets/feed/feed.py @@ -95,11 +95,11 @@ class Feed(Widget): break yield entry - def entries(self): + def get_entries(self): return [entry for entry in self.iterentries()] def num_entries(self): - return len(self.entries()) + return len(self.get_entries()) def update_params(self, d): super(Feed, self).update_params(d) diff --git a/moksha/tests/test_feed.py b/moksha/tests/test_feed.py index 1045e7e..843411d 100644 --- a/moksha/tests/test_feed.py +++ b/moksha/tests/test_feed.py @@ -28,7 +28,7 @@ class TestFeed(object): assert feed.num_entries() > 0 for entry in feed.iterentries(): pass - for entry in feed.entries(): + for entry in feed.get_entries(): pass def test_widget_children(self): diff --git a/moksha/wsgiapp.py b/moksha/wsgiapp.py index 4047d4f..6ad66af 100644 --- a/moksha/wsgiapp.py +++ b/moksha/wsgiapp.py @@ -52,4 +52,3 @@ class MokshaAppDispatcher(PylonsApp): return self.root() else: return self.application -

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Moksha-commits May 2009