moksha/connector/utils.py | 2 +- moksha/lib/helpers.py | 5 ++--- moksha/public/javascript/moksha.js | 3 +++ 3 files changed, 6 insertions(+), 4 deletions(-)
New commits: commit 511d3860782cb24960a6c3ab1e5d326ec1fe13e7 Merge: e3b001a... d59d25a... Author: John (J5) Palmieri johnp@redhat.com Date: Mon Mar 16 13:54:21 2009 -0400
Merge branch 'master' of git+ssh://johnp@git.fedorahosted.org/git/moksha
commit e3b001a25c0397b793edb391dd54d27d209a4ae8 Author: John (J5) Palmieri johnp@redhat.com Date: Mon Mar 16 13:52:53 2009 -0400
fixup some bugs, define True = true & False = false for python to js conversion
diff --git a/moksha/connector/utils.py b/moksha/connector/utils.py index 0642557..5826942 100644 --- a/moksha/connector/utils.py +++ b/moksha/connector/utils.py @@ -88,7 +88,7 @@ class DateTimeDisplay(object):
if el['days'] < 7: when = "%d %s ago" % plural(el['days'], 'day', 'days') - elif el.days < 365: + elif el['days'] < 365: when = "%d %s ago" % plural(int(el['days'] / 7), 'week', 'weeks') else: when = "%d %s ago" % plural(int(el['days'] / 365), 'year', 'years') diff --git a/moksha/lib/helpers.py b/moksha/lib/helpers.py index 535a40d..ca73134 100644 --- a/moksha/lib/helpers.py +++ b/moksha/lib/helpers.py @@ -59,6 +59,7 @@ class ConfigWrapper(object): """ def __init__(self): super(ConfigWrapper, self).__init__() + self.uuid = 'uuid' + str(uuid.uuid4())
@staticmethod def _validate_predicates(predicates): @@ -94,10 +95,8 @@ class ConfigWrapper(object): """Override this in derived classes to update the hash representing the configuration option """ - - id = 'uuid' + str(uuid.uuid4()) default_values = dict(query_string='', - id = id) + id = self.uuid)
return default_values
diff --git a/moksha/public/javascript/moksha.js b/moksha/public/javascript/moksha.js index d5ae03f..b25f127 100644 --- a/moksha/public/javascript/moksha.js +++ b/moksha/public/javascript/moksha.js @@ -9,8 +9,11 @@ * jquery.js */
+ (function(){
+True = true +False = false // prevent double loading if (!(typeof(moksha) === 'undefined')) return;