Related-Bug: #1607194 - Config alarm reverting the temp fix made to g…

…et the globalconfig alarm working which was accidentally checked in. Also removing the unwanted validation for the severity dropdown. Change-Id: I6cde987c63c0566c5b0e6dae73d2e4be81c678a6
Juniper · Jul 29, 2016 · d1a2ab2 · d1a2ab2
1 parent a2ec56a
commit d1a2ab2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/webroot/config/alarm/common/ui/js/models/AlarmModel.js b/webroot/config/alarm/common/ui/js/models/AlarmModel.js
@@ -206,11 +206,6 @@ define([
                 },'id_perms.description': {
                     required: true,
                     msg: 'Enter Description'
-                }, 'alarm_severity': function (value, attr, finalObj) {
-                    var severity = parseInt(value);
-                    if (isNaN(severity)) {
-                        return 'Enter valid Severity between 0-7'
-                    }
                 }
             }
         }

diff --git a/webroot/config/infra/globalconfig/ui/js/views/ConfigAlarmGlobalListView.js b/webroot/config/infra/globalconfig/ui/js/views/ConfigAlarmGlobalListView.js
@@ -26,7 +26,7 @@ define([
                             data: [{
                                 type: "alarms",
                                 parent_type: "global-system-config",
-                                //parent_fq_name_str: 'default-global-system-config'
+                                parent_fq_name_str: 'default-global-system-config'
                             }]})
                     },
                     dataParser: configAlarmFormatters.parseAlarmDetails,