openstack/monasca-ui
Code Issues Proposed changes

Make delete alarm last action in menu. Remove demo data

Browse Source
This commit is contained in:
Rob Raymond 2014-05-30 09:55:01 -06:00
parent fafcbe78f8
commit e141fe94f1
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
monitoring/tables.py
View File

@ -155,10 +155,10 @@ class AlarmsTable(tables.DataTable):
verbose_name = _("Alarms") verbose_name = _("Alarms")
row_actions = (ShowAlarmHistory, row_actions = (ShowAlarmHistory,
ShowAlarmMeters, ShowAlarmMeters,
EditAlarm,
DeleteAlarm, DeleteAlarm,
EditAlarm, ) )
table_actions = (CreateNotification, CreateAlarm, ) table_actions = (CreateNotification, CreateAlarm, )
status_columns = ['status']
class AlarmHistoryTable(tables.DataTable): class AlarmHistoryTable(tables.DataTable):
@ -179,4 +179,3 @@ class AlarmHistoryTable(tables.DataTable):
name = "users" name = "users"
verbose_name = _("Alarm History") verbose_name = _("Alarm History")
row_actions = (ShowAlarmMeters,) row_actions = (ShowAlarmMeters,)
status_columns = ['status']

13
monitoring/views.py
View File

@ -334,17 +334,8 @@ class AlarmHistoryView(tables.DataTableView):
return super(AlarmHistoryView, self).dispatch(*args, **kwargs) return super(AlarmHistoryView, self).dispatch(*args, **kwargs)
def get_data(self): def get_data(self):
results = [ # to be implemented
{'Host': 'Compute1', 'Service': 'Nova', 'Status': 'CRITICAL', results = []
'Last_Check': 'Feb 12 2014 2:34 CST',
'Status_Information': 'API Response Time'},
{'Host': 'Compute1', 'Service': 'Nova', 'Status': 'OK',
'Last_Check': 'Feb 12 2014 2:45 CST',
'Status_Information': 'API Response Time'},
{'Host': 'Compute1', 'Service': 'Nova', 'Status': 'WARNING',
'Last_Check': 'April 18 2014 8:45 CST',
'Status_Information': 'API Response Time'}
]
return results return results