summaryrefslogtreecommitdiffstats
path: root/module/web/webinterface.py
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-07-12 23:42:11 +0200
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-07-12 23:42:11 +0200
commitc52ee8392501ee916d85fd9da75aa08a8f014493 (patch)
tree1cd802f64a1ffe0173473fd1f044e014bee59fff /module/web/webinterface.py
parentchanged version strings (diff)
downloadpyload-c52ee8392501ee916d85fd9da75aa08a8f014493.tar.xz
removed server_methods, please test everything entirely
Diffstat (limited to 'module/web/webinterface.py')
-rw-r--r--module/web/webinterface.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/module/web/webinterface.py b/module/web/webinterface.py
index 69e67f9e4..e54c8b137 100644
--- a/module/web/webinterface.py
+++ b/module/web/webinterface.py
@@ -49,7 +49,7 @@ if not ServerThread.core:
else:
raise Exception("Could not access pyLoad Core")
else:
- PYLOAD = ServerThread.core.server_methods
+ PYLOAD = ServerThread.core.api
config = ServerThread.core.config
from module.common.JsEngine import JsEngine
@@ -72,7 +72,7 @@ loader = PrefixLoader({
})
env = Environment(loader=loader, extensions=['jinja2.ext.i18n'], trim_blocks=True, auto_reload=False, bytecode_cache=bcc)
-from filters import quotepath, path_make_relative, path_make_absolute, truncate,date
+from filters import quotepath, path_make_relative, path_make_absolute, truncate, date
env.filters["quotepath"] = quotepath
env.filters["truncate"] = truncate
@@ -80,6 +80,7 @@ env.filters["date"] = date
env.filters["path_make_relative"] = path_make_relative
env.filters["path_make_absolute"] = path_make_absolute
env.filters["decode"] = decode
+env.filters["type"] = lambda x: str(type(x))
translation = gettext.translation("django", join(PYLOAD_DIR, "locale"),