summaryrefslogtreecommitdiffstats
path: root/module/web
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2010-07-29 17:05:45 +0200
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2010-07-29 17:05:45 +0200
commit252cf9964a2ebc78a589f75db2a7be0d25cac512 (patch)
tree0f4cd1a7949f8a3dc87eaed35f248170ee421943 /module/web
parentmany new stuff, some things already working (diff)
downloadpyload-252cf9964a2ebc78a589f75db2a7be0d25cac512.tar.xz
more improvements and cleaned some imports
Diffstat (limited to 'module/web')
-rw-r--r--module/web/ajax/views.py5
-rw-r--r--module/web/templates/default/queue.html2
2 files changed, 5 insertions, 2 deletions
diff --git a/module/web/ajax/views.py b/module/web/ajax/views.py
index 5e4d4710b..558d35415 100644
--- a/module/web/ajax/views.py
+++ b/module/web/ajax/views.py
@@ -11,6 +11,8 @@ from django.utils import simplejson
from django.utils.translation import ugettext as _
import base64
+from traceback import print_exc
+
def format_time(seconds):
seconds = int(seconds)
@@ -85,7 +87,8 @@ def remove_link(request, id):
try:
settings.PYLOAD.del_links([int(id)])
return JsonResponse("sucess")
- except:
+ except Exception, e:
+ print_exc()
return HttpResponseServerError()
@permission('pyload.can_see_dl')
diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html
index d149853d5..71285ddb8 100644
--- a/module/web/templates/default/queue.html
+++ b/module/web/templates/default/queue.html
@@ -113,7 +113,7 @@ document.addEvent("domready", function(){
</span>
<span style="font-size: 15px">{{ child.name }}</span><br />
<div class="child_secrow">
- <span class="child_status">{{ child.status }}</span>{{child.error}}&nbsp;
+ <span class="child_status">{{ child.statusmsg }}</span>{{child.error}}&nbsp;
<span class="child_status">{{ child.size }} KB</span>
<span class="child_status">{{ child.plugin }}</span>
<span class="child_status">{% trans "Folder:" %} {{package.folder}}</span>