git://git.onelab.eu
/
monitor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added actionlist_template to display action list consistently on different pages
[monitor.git]
/
monitor
/
database
/
info
/
interface.py
diff --git
a/monitor/database/info/interface.py
b/monitor/database/info/interface.py
index
ef7d510
..
06c83a0
100644
(file)
--- a/
monitor/database/info/interface.py
+++ b/
monitor/database/info/interface.py
@@
-114,7
+114,7
@@
class SiteInterface(HistorySiteRecord):
# those errors.
args = {'loginbase' : self.db.loginbase,
# those errors.
args = {'loginbase' : self.db.loginbase,
- 'penalty_level' : self.db.penalty_level,
+ 'penalty_level' :
-
self.db.penalty_level,
'monitor_hostname' : config.MONITOR_HOSTNAME,
'support_email' : config.support_email,
'plc_name' : config.PLC_NAME,
'monitor_hostname' : config.MONITOR_HOSTNAME,
'support_email' : config.support_email,
'plc_name' : config.PLC_NAME,
@@
-201,7
+201,8
@@
class SiteInterface(HistorySiteRecord):
action_type='bootmanager_restore',
error_string="")
action_type='bootmanager_restore',
error_string="")
- act = ActionRecord(loginbase=self.db.loginbase,
+ if ret:
+ act = ActionRecord(loginbase=self.db.loginbase,
hostname=hostname,
action='reboot',
action_type='bootmanager_' + ret,
hostname=hostname,
action='reboot',
action_type='bootmanager_' + ret,