docs/main/VirtualenvInstallation.rst | 2 +-
moksha/apps/menus/moksha/apps/menus/controllers/menu.py | 2 +-
moksha/controllers/widgets.py | 2 +-
moksha/middleware/middleware.py | 5 +++--
moksha/widgets/container/container.py | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
New commits:
commit d5cbb9b67d80701469c612b2b5be0509c1c8229f
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sat Sep 11 18:49:10 2010 -0400
Make our feed store & cache more configurable
diff --git a/moksha/middleware/middleware.py b/moksha/middleware/middleware.py
index 315e313..92d0639 100644
--- a/moksha/middleware/middleware.py
+++ b/moksha/middleware/middleware.py
@@ -72,8 +72,9 @@ class MokshaMiddleware(object):
self.load_menus()
try:
- moksha.feed_storage = Shove(config.get('feed_cache',
- 'sqlite:///%(here)s/feeds.db'), compress=True)
+ moksha.feed_storage = Shove(config.get('feed_store',
'simple://'),
+ config.get('feed_cache',
'simple://'),
+ compress=True)
moksha.feed_cache = Cache(moksha.feed_storage)
except Exception, e:
log.exception(e)
commit b81b9402806bad9e05f23614f52c36e2cbac6b79
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sat Sep 11 18:48:35 2010 -0400
Rename our default methods to _default, per new TG2 standard
diff --git a/moksha/apps/menus/moksha/apps/menus/controllers/menu.py
b/moksha/apps/menus/moksha/apps/menus/controllers/menu.py
index f2c4e62..bd40fe9 100644
--- a/moksha/apps/menus/moksha/apps/menus/controllers/menu.py
+++ b/moksha/apps/menus/moksha/apps/menus/controllers/menu.py
@@ -23,7 +23,7 @@ class MokshaMenuController(Controller):
name = 'Moksha Menus'
@expose()
- def default(self, menuId, *args, **kw):
+ def _default(self, menuId, *args, **kw):
""" For the selected `menuId`, return the menu HTML.
The `menuId` is the name of the portion of the menu that was clicked
diff --git a/moksha/controllers/widgets.py b/moksha/controllers/widgets.py
index 00542e9..07cca6f 100644
--- a/moksha/controllers/widgets.py
+++ b/moksha/controllers/widgets.py
@@ -41,7 +41,7 @@ class WidgetController(Controller):
'module': validators.StringBool(),
'iframe': validators.StringBool(),
})
- def default(self, widget, chrome=False, live=False, source=False,
+ def _default(self, widget, chrome=False, live=False, source=False,
module=False, iframe=False, **kw):
""" Display a single widget.
commit ce94925c7813a77c686927b1e68f1e052505e2d1
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sat Sep 11 18:48:06 2010 -0400
Make our Container widget robust enough to handle different ToscaWidget versions
diff --git a/moksha/widgets/container/container.py
b/moksha/widgets/container/container.py
index 5a11dde..69563db 100644
--- a/moksha/widgets/container/container.py
+++ b/moksha/widgets/container/container.py
@@ -69,7 +69,7 @@ class MokshaContainer(Widget):
if isinstance(d.content, Widget):
d.widget_name = d.content.__class__.__name__
- content_args = d.content_args or {}
+ content_args = getattr(d, 'content_args', {})
if isinstance(d.content, LiveWidget):
topics = d.content.get_topics()
commit 1004643fa08021c8bbdfceeda984fa232b6ae2d1
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sat Sep 11 18:24:02 2010 -0400
Add openssl-devel to getting started docs
diff --git a/docs/main/VirtualenvInstallation.rst b/docs/main/VirtualenvInstallation.rst
index 89370a0..7d9d282 100644
--- a/docs/main/VirtualenvInstallation.rst
+++ b/docs/main/VirtualenvInstallation.rst
@@ -18,7 +18,7 @@ You'll need the `virtualenv
<
http://pypi.python.org/pypi/virtualenv>`_ package.
.. code-block:: bash
- # yum -y install python-virtualenv gcc
+ # yum -y install python-virtualenv gcc openssl-devel
# yum-builddep -y python-lxml pyOpenSSL python-sqlite2