moksha/api/widgets/amqp/amqp.py | 8 +--
moksha/api/widgets/amqp/templates/amqp.mak | 8 +--
moksha/api/widgets/global_resources/templates/global.mak | 2
moksha/api/widgets/global_resources/widget.py | 35 ++++++---------
moksha/api/widgets/grid.py | 13 +++--
moksha/api/widgets/stomp/stomp.py | 20 ++++----
moksha/api/widgets/stomp/templates/stomp.mak | 10 ++--
7 files changed, 47 insertions(+), 49 deletions(-)
New commits:
commit 5126ec395cba10eaaf5780e2821957d350720630
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Nov 2 14:23:04 2011 -0400
Some tweaks to our Grid ids
diff --git a/moksha/api/widgets/grid.py b/moksha/api/widgets/grid.py
index 0c5fc27..e08ac8e 100644
--- a/moksha/api/widgets/grid.py
+++ b/moksha/api/widgets/grid.py
@@ -90,9 +90,12 @@ class TW1Grid(tw.forms.FormField):
alphaPager = False
numericPager = False
morePager = False
+ uid = None
def update_params(self, d):
super(TW1Grid, self).update_params(d)
+ if not getattr(d,"id",None):
+ raise ValueError, "Moksha Grid is supposed to have id"
if not d.filters:
d.filters = {}
@@ -106,7 +109,7 @@ class TW1Grid(tw.forms.FormField):
grid_d[p] = v
- d['id'] += "-uuid" + str(uuid.uuid4())
+ d['id'] = self.__class__.__name__ + str(uuid.uuid4())
self.add_call(when_ready(tw.jquery.jQuery("#%s" % d['id']).mokshagrid(grid_d)))
@@ -122,6 +125,7 @@ class TW2Grid(tw2.forms.widgets.FormField):
'numericPager']
hidden = True # hide from the moksha main menu
+ id = twc.Param(default=None)
rows_per_page = twc.Param(default=10)
page_num = twc.Param(default=1)
total_rows = twc.Param(default=0)
@@ -136,8 +140,12 @@ class TW2Grid(tw2.forms.widgets.FormField):
more_link = twc.Param(default=None)
alphaPager = twc.Param(default=False)
numericPager = twc.Param(default=False)
+ uid = twc.Param(default=None)
def prepare(self):
+ """
+ Subclasses *must* call super as the last thing in their prepare() method
+ """
super(TW2Grid, self).prepare()
if not self.filters:
@@ -152,7 +160,7 @@ class TW2Grid(tw2.forms.widgets.FormField):
grid_d[p] = v
- self.id += "-uuid" + str(uuid.uuid4())
+ self.id = self.__class__.__name__ + str(uuid.uuid4())
self.add_call(when_ready(tw2.jquery.jQuery("#%s" % self.id).mokshagrid(grid_d)))
commit 06dd27f6627d701b4f784cb03b4eb014ed89f8ae
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Nov 2 14:22:06 2011 -0400
Some cleanups/optimizations to our global resource injection widget
diff --git a/moksha/api/widgets/global_resources/widget.py b/moksha/api/widgets/global_resources/widget.py
index df78122..45c2c31 100644
--- a/moksha/api/widgets/global_resources/widget.py
+++ b/moksha/api/widgets/global_resources/widget.py
@@ -97,20 +97,17 @@ class TW1GlobalResourceInjectionWidget(tw.api.Widget):
trusted_domain_hash = '{%s}' % ','.join(item_list)
self.csrf_trusted_domains_hash = trusted_domain_hash
- def update_params(self, d):
- super(TW1GlobalResourceInjectionWidget, self).update_params(d)
-
- d['base_url'] = url('/')
-
if asbool(config.get('debug')):
- d['debug'] = 'true'
+ self.debug = 'true'
if asbool(config['global_conf'].get('profile')):
- d['profile'] = 'true'
-
+ self.profile = 'true'
if asbool(config['global_conf'].get('profile.connectors')):
- d['profile_connectors'] = 'true'
+ self.profile_connectors = 'true'
+
+ def update_params(self, d):
+ super(TW1GlobalResourceInjectionWidget, self).update_params(d)
- d['csrf_trusted_domains'] = self.csrf_trusted_domains_hash
+ d['base_url'] = url('/')
identity = request.environ.get('repoze.who.identity')
if identity:
@@ -149,6 +146,13 @@ class TW2GlobalResourceInjectionWidget(twc.Widget):
def __init__(self):
super(TW2GlobalResourceInjectionWidget, self).__init__()
+ if asbool(config.get('debug')):
+ self.debug = 'true'
+ if asbool(config['global_conf'].get('profile')):
+ self.profile = 'true'
+ if asbool(config['global_conf'].get('profile.connectors')):
+ self.profile_connectors = 'true'
+
for widget_entry in pkg_resources.iter_entry_points('moksha.global'):
log.info('Loading global resource: %s' % widget_entry.name)
loaded = widget_entry.load()
@@ -184,21 +188,13 @@ class TW2GlobalResourceInjectionWidget(twc.Widget):
item_list.append('"%s": true' % domain)
trusted_domain_hash = '{%s}' % ','.join(item_list)
self.csrf_trusted_domains_hash = trusted_domain_hash
+ self.csrf_trusted_domains = self.csrf_trusted_domains_hash
def prepare(self):
super(TW2GlobalResourceInjectionWidget, self).prepare()
self.base_url = url('/')
- if asbool(config.get('debug')):
- self.debug = 'true'
- if asbool(config['global_conf'].get('profile')):
- self.profile = 'true'
- if asbool(config['global_conf'].get('profile.connectors')):
- self.profile_connectors = 'true'
-
- self.csrf_trusted_domains = self.csrf_trusted_domains_hash
-
identity = request.environ.get('repoze.who.identity')
if identity:
self.csrf_token = identity.get(self.csrf_token_id, '')
@@ -211,4 +207,3 @@ else:
GlobalResourceInjectionWidget = TW1GlobalResourceInjectionWidget
global_resources = GlobalResourceInjectionWidget()
-
commit cbf9f9a3a5e104c67d3c7ef2d4226ef0436555c3
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Nov 2 14:21:46 2011 -0400
Don't str-ify our global resource children
diff --git a/moksha/api/widgets/global_resources/templates/global.mak b/moksha/api/widgets/global_resources/templates/global.mak
index 3b1bf4f..6780b3e 100644
--- a/moksha/api/widgets/global_resources/templates/global.mak
+++ b/moksha/api/widgets/global_resources/templates/global.mak
@@ -1,6 +1,6 @@
<%namespace name="tw" module="moksha.utils.mako"/>
% for child in tw._('c'):
- ${str(child.display()) | n}
+ ${child.display() | n}
% endfor
<script type="text/javascript">
moksha_base_url = "${tw._('base_url')}";
commit e5365d35e6cab4e6020962095621820f05c39c33
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Nov 2 14:20:46 2011 -0400
Stringify some of our live socket parameters
diff --git a/moksha/api/widgets/amqp/amqp.py b/moksha/api/widgets/amqp/amqp.py
index d0ea4e3..5482846 100644
--- a/moksha/api/widgets/amqp/amqp.py
+++ b/moksha/api/widgets/amqp/amqp.py
@@ -87,14 +87,14 @@ class TW1AMQPSocket(tw.api.Widget):
def __init__(self, *args, **kw):
self.notify = asbool(config.get('moksha.socket.notify', False))
self.orbited_host = config.get('orbited_host', 'localhost')
- self.orbited_port = config.get('orbited_port', 9000)
+ self.orbited_port = str(config.get('orbited_port', 9000))
self.orbited_scheme = config.get('orbited_scheme', 'http')
self.orbited_url = '%s://%s:%s' % (
self.orbited_scheme, self.orbited_host, self.orbited_port)
self.orbited_js = tw.api.JSLink(
link=self.orbited_url + '/static/Orbited.js')
self.amqp_broker_host = config.get('amqp_broker_host', 'localhost')
- self.amqp_broker_port = config.get('amqp_broker_port', 5672)
+ self.amqp_broker_port = str(config.get('amqp_broker_port', 5672))
self.amqp_broker_user = config.get('amqp_broker_user', 'guest')
self.amqp_broker_pass = config.get('amqp_broker_pass', 'guest')
super(TW1AMQPSocket, self).__init__(*args, **kw)
@@ -135,7 +135,7 @@ class TW2AMQPSocket(twc.Widget):
orbited_host = twc.Param(
default=config.get('orbited_host', 'localhost'))
orbited_port = twc.Param(
- default=config.get('orbited_port', 9000))
+ default=str(config.get('orbited_port', 9000)))
orbited_scheme = twc.Param(
default=config.get('orbited_scheme', 'http'))
orbited_js = twc.Param(default=orbited_js)
@@ -143,7 +143,7 @@ class TW2AMQPSocket(twc.Widget):
amqp_broker_host = twc.Param(
default=config.get('amqp_broker_host', 'localhost'))
amqp_broker_port = twc.Param(
- default=config.get('amqp_broker_port', 5672))
+ default=str(config.get('amqp_broker_port', 5672)))
amqp_broker_user = twc.Param(
default=config.get('amqp_broker_user', 'guest'))
amqp_broker_pass = twc.Param(
diff --git a/moksha/api/widgets/amqp/templates/amqp.mak b/moksha/api/widgets/amqp/templates/amqp.mak
index 0728016..92cae85 100644
--- a/moksha/api/widgets/amqp/templates/amqp.mak
+++ b/moksha/api/widgets/amqp/templates/amqp.mak
@@ -43,10 +43,10 @@ if (typeof moksha_amqp_conn == 'undefined') {
Orbited.settings.streaming = true;
moksha_amqp_conn = new amqp.Connection({
% if tw._("send_hook"):
- send_hook: function(data, frame) { ${tw._("send_hook")} },
+ send_hook: function(data, frame) { ${unicode(tw._("send_hook"))} },
% endif
% if tw._("receive_hook"):
- recive_hook: function(data, frame) { ${tw._("receive_hook")} },
+ recive_hook: function(data, frame) { ${unicode(tw._("receive_hook"))} },
% endif
host: '${tw._("amqp_broker_host")}',
port: ${tw._("amqp_broker_port")},
@@ -73,7 +73,7 @@ if (typeof moksha_amqp_conn == 'undefined') {
});
% if tw._("onconnectedframe"):
- ${tw._("onconnectedframe")}
+ ${unicode(tw._("onconnectedframe"))}
moksha_amqp_queue.start();
% endif
@@ -89,7 +89,7 @@ if (typeof moksha_amqp_conn == 'undefined') {
} else {
## Utilize the existing Moksha AMQP socket connection
- ${tw._("onconnectedframe")}
+ ${unicode(tw._("onconnectedframe"))}
moksha_amqp_queue.start();
}
diff --git a/moksha/api/widgets/stomp/stomp.py b/moksha/api/widgets/stomp/stomp.py
index 652481b..669afc9 100644
--- a/moksha/api/widgets/stomp/stomp.py
+++ b/moksha/api/widgets/stomp/stomp.py
@@ -84,14 +84,14 @@ class TW1StompWidget(tw.api.Widget):
def __init__(self, *args, **kw):
self.notify = asbool(config.get('moksha.socket.notify', False))
self.orbited_host = config.get('orbited_host', 'localhost')
- self.orbited_port = config.get('orbited_port', 9000)
+ self.orbited_port = str(config.get('orbited_port', 9000))
self.orbited_scheme = config.get('orbited_scheme', 'http')
self.orbited_url = '%s://%s:%s' % (
self.orbited_scheme, self.orbited_host, self.orbited_port)
self.orbited_js = tw.api.JSLink(
link=self.orbited_url + '/static/Orbited.js')
self.stomp_host = config.get('stomp_host', 'localhost')
- self.stomp_port = config.get('stomp_port', 61613)
+ self.stomp_port = str(config.get('stomp_port', 61613))
self.stomp_user = config.get('stomp_user', 'guest')
self.stomp_pass = config.get('stomp_pass', 'guest')
super(TW1StompWidget, self).__init__(*args, **kw)
@@ -138,7 +138,7 @@ class TW2StompWidget(twc.Widget):
orbited_host = twc.Param(
default=config.get('orbited_host', 'localhost'))
orbited_port = twc.Param(
- default=config.get('orbited_port', 9000))
+ default=str(config.get('orbited_port', 9000)))
orbited_scheme = twc.Param(
default=config.get('orbited_scheme', 'http'))
orbited_js = twc.Param(default=orbited_js)
@@ -146,18 +146,18 @@ class TW2StompWidget(twc.Widget):
stomp_host = twc.Param(
default=config.get('stomp_host', 'localhost'))
stomp_port = twc.Param(
- default=config.get('stomp_port', 61613))
+ default=str(config.get('stomp_port', 61613)))
stomp_user = twc.Param(
default=config.get('stomp_user', 'guest'))
stomp_pass = twc.Param(
default=config.get('stomp_pass', 'guest'))
- onopen = twc.Param(default=twc.JSSymbol(src="function(){}"))
- onerror = twc.Param(default=twc.JSSymbol(src="function(){}"))
- onclose = twc.Param(default=twc.JSSymbol(src="function(){}"))
- onerrorframe = twc.Param(default=twc.JSSymbol(src="function(){}"))
- onmessageframe = twc.Param(default=twc.JSSymbol(src=""))
- onconnectedframe = twc.Param(default=twc.JSSymbol(src=""))
+ onopen = twc.Param(default=twc.js_callback("function(){}"))
+ onerror = twc.Param(default=twc.js_callback("function(){}"))
+ onclose = twc.Param(default=twc.js_callback("function(){}"))
+ onerrorframe = twc.Param(default=twc.js_callback("function(){}"))
+ onmessageframe = twc.Param(default='')
+ onconnectedframe = twc.Param(default='')
template = "mako:moksha.api.widgets.stomp.templates.stomp"
diff --git a/moksha/api/widgets/stomp/templates/stomp.mak b/moksha/api/widgets/stomp/templates/stomp.mak
index b5eeeb6..bb29731 100644
--- a/moksha/api/widgets/stomp/templates/stomp.mak
+++ b/moksha/api/widgets/stomp/templates/stomp.mak
@@ -28,14 +28,14 @@ if (typeof TCPSocket == 'undefined') {
function(){
## Create a new TCPSocket & Stomp client
stomp = new STOMPClient();
- stomp.onopen = ${tw._('onopen')};
- stomp.onclose = ${tw._('onclose')};
- stomp.onerror = ${tw._('onerror')};
- stomp.onerrorframe = ${tw._('onerrorframe')};
+ stomp.onopen = ${unicode(tw._('onopen'))};
+ stomp.onclose = ${unicode(tw._('onclose'))};
+ stomp.onerror = ${unicode(tw._('onerror'))};
+ stomp.onerrorframe = ${unicode(tw._('onerrorframe'))};
stomp.onconnectedframe = function(){
moksha_socket_busy = false;
$('body').triggerHandler('moksha.socket_ready');
- ${tw._('onconnectedframe')}
+ ${unicode(tw._('onconnectedframe'))}
};
stomp.onmessageframe = function(f){
var dest = f.headers.destination;
commit 17a1b7d20d95ed203f1f04c6ba91531b81b6861a
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Nov 1 23:01:17 2011 -0400
Remove an unnecessary id check in our TW2 grid widget
diff --git a/moksha/api/widgets/grid.py b/moksha/api/widgets/grid.py
index caab6f4..0c5fc27 100644
--- a/moksha/api/widgets/grid.py
+++ b/moksha/api/widgets/grid.py
@@ -93,8 +93,6 @@ class TW1Grid(tw.forms.FormField):
def update_params(self, d):
super(TW1Grid, self).update_params(d)
- if not getattr(d,"id",None):
- raise ValueError, "Moksha Grid is supposed to have id"
if not d.filters:
d.filters = {}
@@ -142,9 +140,6 @@ class TW2Grid(tw2.forms.widgets.FormField):
def prepare(self):
super(TW2Grid, self).prepare()
- if not getattr(self, 'id', None):
- raise ValueError, "Moksha Grid is supposed to have id"
-
if not self.filters:
self.filters = {}
