dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

handing errors when no tickets in db, thanks Niphold

Browse Source
This commit is contained in:
Massimo DiPierro
2012-02-28 15:39:55 -06:00
parent 911961736e
commit 5f3ea90e9e
4 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/admin/views/default.mobile/errors.html
+12 -3
View File
@@ -19,6 +19,9 @@ table.sortable thead {
tr.error_ticket:hover {
background-color: #eee;
}
a.unavailable {
color: #ff0000;
}
</style>
<script language="JavaScript">
@@ -36,7 +39,13 @@ tr.error_ticket:hover {
}
jQuery(document).ready(function() { jQuery('.traceback').hide(); });
</script>
{{if db_ready['status'] == False:
switchurl = db_ready['errmessage']
switchbutton = XML("""<a data-role="button" data-inline="true" data-inline="true" href="%(href)s" title="%(title)s" class="unavailable"><span>switch to : db</span></a>""" % dict(href=switchurl, title=db_ready['errmessage']))
else:
switchurl = URL(args=[app, 'dbnew'])
switchbutton = XML("""<a data-role="button" data-inline="true" data-inline="true" href="%s"><span>switch to : db</span></a>""" % (switchurl))
pass}}
<h2>{{=T('Error logs for "%(app)s"',dict(app=app))}}</h2>
<div>
@@ -59,7 +68,7 @@ tr.error_ticket:hover {
<a data-role="button" data-inline="true" href="{{=URL(args=[app, 'dbold'])}}"><span>lists by ticket</span></a>
{{else:}}
source : filesystem
<a data-role="button" data-inline="true" data-inline="true" href="{{=URL(args=[app, 'dbnew'])}}"><span>switch to : db</span></a>
{{=switchbutton}}
<a data-role="button" data-inline="true" href="{{=URL(args=[app, 'old'])}}"><span>lists by ticket</span></a>
{{pass}}
</p>
@@ -103,7 +112,7 @@ tr.error_ticket:hover {
<a data-role="button" data-inline="true" href="{{=URL(args=[app, 'dbnew'])}}"><span>lists by exception</span></a>
{{else:}}
source : filesystem
<a data-role="button" data-inline="true" href="{{=URL(args=[app, 'dbold'])}}"><span>switch to : db</span></a>
{{=switchbutton}}
<a data-role="button" data-inline="true" href="{{=URL(args=[app, 'new'])}}"><span>lists by exception</span></a>
{{pass}}
</p>
applications/admin/views/default/errors.html
+10 -2
View File
@@ -19,6 +19,9 @@ table.sortable thead {
tr.error_ticket:hover {
background-color: #eee;
}
.controls a.button.unavailable {
color: #ff0000;
}
</style>
<script language="JavaScript">
@@ -36,6 +39,11 @@ tr.error_ticket:hover {
}
jQuery(document).ready(function() { jQuery('.traceback').hide(); });
</script>
{{if db_ready['status'] == False:
switchbutton = A(SPAN("switch to : db"), _href=db_ready['errlink'], _class="button unavailable", _title="%s" % (db_ready['errmessage']))
else:
switchbutton = A(SPAN("switch to : db"), _href=URL(args=[app, 'dbnew']), _class="button")
pass}}
<h2>{{=T('Error logs for "%(app)s"',dict(app=app))}}</h2>
@@ -57,7 +65,7 @@ tr.error_ticket:hover {
<a class="button" href="{{=URL(args=[app, 'dbold'])}}"><span>lists by ticket</span></a>
{{else:}}
source : filesystem
<a class="button" href="{{=URL(args=[app, 'dbnew'])}}"><span>switch to : db</span></a>
{{=switchbutton}}
<a class="button" href="{{=URL(args=[app, 'old'])}}"><span>lists by ticket</span></a>
{{pass}}
</p>
@@ -101,7 +109,7 @@ tr.error_ticket:hover {
<a class="button" href="{{=URL(args=[app, 'dbnew'])}}"><span>lists by exception</span></a>
{{else:}}
source : filesystem
<a class="button" href="{{=URL(args=[app, 'dbold'])}}"><span>switch to : db</span></a>
{{=switchbutton}}
<a class="button" href="{{=URL(args=[app, 'new'])}}"><span>lists by exception</span></a>
{{pass}}
</p>