diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2011-10-09 20:12:20 +0200 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2011-10-09 20:12:20 +0200 |
| commit | 98a9f43b5585efbe6b69622040a602089c93f58a (patch) | |
| tree | bf538c28d15dc7d347fe0545528260db6637513a /module/web | |
| parent | Merged in mineo/pyload (pull request #1) (diff) | |
| download | pyload-98a9f43b5585efbe6b69622040a602089c93f58a.tar.xz | |
closed #400
Diffstat (limited to 'module/web')
| -rw-r--r-- | module/web/api_app.py | 1 | ||||
| -rw-r--r-- | module/web/templates/default/login.html | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/module/web/api_app.py b/module/web/api_app.py index 25b9f7d3d..db735a5b9 100644 --- a/module/web/api_app.py +++ b/module/web/api_app.py @@ -64,6 +64,7 @@ def callApi(func, *args, **kwargs): result = getattr(PYLOAD, func)(*[literal_eval(x) for x in args], **dict([(x, literal_eval(y)) for x, y in kwargs.iteritems()])) + # null is invalid json response if result is None: result = True return json.dumps(result, cls=TBaseEncoder) diff --git a/module/web/templates/default/login.html b/module/web/templates/default/login.html index efca4269b..9e91ad309 100644 --- a/module/web/templates/default/login.html +++ b/module/web/templates/default/login.html @@ -12,12 +12,12 @@ <legend>Login</legend> <label> <span>{{_("Username")}}</span> - <input type="text" size="20" name="username"/> + <input type="text" size="20" name="username" /> </label> <br /> <label> <span>{{_("Password")}}</span> - <input type="password" size="20" name="password"> + <input type="password" size="20" name="password" /> </label> <br /> <input type="submit" value="Login" class="button" /> |