From 3a30660c259a5526f98403baca8d5f8003ee175b Mon Sep 17 00:00:00 2001 From: Nick Daly Date: Wed, 30 Oct 2013 21:45:43 -0500 Subject: [PATCH] Revert 4d529b75857597dedd181045ba1bf97b99c66b3e. Turns out, that was a terrible idea. Putting privilegedactions in actions/ meant that we tried to interpret it during startup (along with other similarly silly bugs). The fastest way to fix this issue is to merely revert it. --- modules/installed/apps/apps.py | 10 +++++----- modules/installed/services/xmpp.py | 4 ++-- modules/installed/system/config.py | 2 +- actions/privilegedactions.py => privilegedactions.py | 0 4 files changed, 8 insertions(+), 8 deletions(-) rename actions/privilegedactions.py => privilegedactions.py (100%) diff --git a/modules/installed/apps/apps.py b/modules/installed/apps/apps.py index 279f05c6f..d6ba9d662 100644 --- a/modules/installed/apps/apps.py +++ b/modules/installed/apps/apps.py @@ -3,7 +3,7 @@ from gettext import gettext as _ from modules.auth import require from plugin_mount import PagePlugin from forms import Form -from actions.privilegedactions import privilegedaction_run +from privilegedactions import privilegedaction_run import cfg class Apps(PagePlugin): @@ -18,7 +18,7 @@ class Apps(PagePlugin): def index(self): main = """

User Applications are web apps hosted on your %s.

- +

Eventually this box could be your photo sharing site, your instant messaging site, your social networking site, your news site. Remember web portals? We can be one of those too. @@ -35,7 +35,7 @@ class Apps(PagePlugin): digital property you have, so why trust it to companies that have no investment in the sentimental value of your family snaps? Keep those photos local, backed up, easily accessed and free from the whims of -some other website's business model.

+some other websites business model.

""") @cherrypy.expose @@ -67,8 +67,8 @@ some other website's business model.

main=""" """ - form = Form(title="Configuration", - action="/apps/owncloud", + form = Form(title="Configuration", + action="/apps/owncloud", name="configure_owncloud", message='') form.checkbox(_("Enable Owncloud"), name="owncloud_enable", id="owncloud_enable", checked=checkedinfo['enable']) diff --git a/modules/installed/services/xmpp.py b/modules/installed/services/xmpp.py index 2a6b6f14c..6140cf1c5 100644 --- a/modules/installed/services/xmpp.py +++ b/modules/installed/services/xmpp.py @@ -4,7 +4,7 @@ from modules.auth import require from plugin_mount import PagePlugin, FormPlugin import cfg from forms import Form -from actions.privilegedactions import privilegedaction_run +from privilegedactions import privilegedaction_run from util import Message class xmpp(PagePlugin): @@ -46,7 +46,7 @@ class xmpp(PagePlugin): action="/services/xmpp", name="configure_xmpp", message='') - form.checkbox(_("Allow In-Band Registration"), name="xmpp_inband_enable", + form.checkbox(_("Allow In-Band Registration"), name="xmpp_inband_enable", id="xmpp_inband_enable", checked=checkedinfo['inband_enable']) form.hidden(name="submitted", value="True") form.html(_("

When enabled, anyone who can reach this server will be allowed to register an account through an XMPP client.

")) diff --git a/modules/installed/system/config.py b/modules/installed/system/config.py index 29f39a3a6..d6b22467a 100644 --- a/modules/installed/system/config.py +++ b/modules/installed/system/config.py @@ -9,7 +9,7 @@ from gettext import gettext as _ from filedict import FileDict from modules.auth import require from plugin_mount import PagePlugin, FormPlugin -from actions.privilegedactions import privilegedaction_run +from privilegedactions import privilegedaction_run import cfg from forms import Form from model import User diff --git a/actions/privilegedactions.py b/privilegedactions.py similarity index 100% rename from actions/privilegedactions.py rename to privilegedactions.py