diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2011-10-02 16:50:03 +0200 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2011-10-02 16:50:03 +0200 |
| commit | eb034e731f610705c10f4b182772183fdefd8e28 (patch) | |
| tree | a9e7887df443451bdc133717c225a77a2f0663b8 /module/web | |
| parent | purged old plugins (diff) | |
| download | pyload-eb034e731f610705c10f4b182772183fdefd8e28.tar.xz | |
Diffstat (limited to 'module/web')
| -rw-r--r-- | module/web/pyload_app.py | 3 | ||||
| -rw-r--r-- | module/web/templates/default/base.html | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/module/web/pyload_app.py b/module/web/pyload_app.py index 553eeaa57..0370e19cb 100644 --- a/module/web/pyload_app.py +++ b/module/web/pyload_app.py @@ -470,7 +470,8 @@ def logs(item=-1): @route("/admin", method="POST") @login_required("ADMIN") def admin(): - user = PYLOAD.getAllUserData() + # convert to dict + user = dict([(name, toDict(y)) for name, y in PYLOAD.getAllUserData().iteritems()]) perms = permlist() for data in user.itervalues(): diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index 2987cf081..c7014e6b6 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -148,7 +148,9 @@ function out(){ function show_cap(){
bg_show();
$("cap_box").setStyle('display', 'block');
- cap_box.start('opacity',1)
+ cap_box.start('opacity',1).chain(function(){
+ $('cap_result').focus();
+ });
}
function hide_cap(){
|