Add watch window (#11)

 * add script enable option

diff --git a/karesansui/gadget/hostby1watch.py b/karesansui/gadget/hostby1watch.py
index 8fb2e56..7c1b873 100644 (file)
--- a/karesansui/gadget/hostby1watch.py
+++ b/karesansui/gadget/hostby1watch.py
@@ -202,9 +202,12 @@ class HostBy1Watch(Rest):
             type = COLLECTD_UPTIME_TYPE
             plugin_ds = COLLECTD_UPTIME_DS
 
+        else:
+            return web.badrequest()
+
         plugin_selector = create_plugin_selector(plugin_instance, type, type_instance, plugin_ds)
 
-        ## text 
+        ## text
         continuation_count = self.input.continuation_count
         prohibition_period = self.input.prohibition_period
         warning_threshold = self.input.warning_threshold
@@ -212,10 +215,12 @@ class HostBy1Watch(Rest):
         warning_script = self.input.warning_script
         failure_script = self.input.failure_script
         okay_script = self.input.okay_script
-        
+
         ## bool
         bool_input_key = ["use_percentage", "enable_warning_mail",
-                          "enable_failure_mail", "enable_okay_mail"]
+                          "enable_failure_mail", "enable_okay_mail",
+                          "enable_warning_script", "enable_failure_script",
+                          "enable_okay_script"]
         bool_values = {}
         for key in bool_input_key:
             if self.input.has_key(key):

diff --git a/karesansui/templates/default/hostby1watch/hostby1watch.input b/karesansui/templates/default/hostby1watch/hostby1watch.input
index dd3985a..0ca1d8e 100644 (file)
--- a/karesansui/templates/default/hostby1watch/hostby1watch.input
+++ b/karesansui/templates/default/hostby1watch/hostby1watch.input
@@ -358,9 +358,9 @@ $(document).ready(function(){
 
             <div class="grayout-param">${_('Warning Script')}<span id="warning_script_help"></span></div>
             <div class="grayout-value grayout-form">
+                <input type="checkbox" name="enable_warning_script" id="enable_warning_script" /> ${_('Enable Script')}
                    <textarea cols="85" rows="3" name="warning_script" id="warning_script"></textarea>
             </div>
-
             <div class="grayout-param">${_('Enable Warning Mail')}<span id="enable_warning_mail_help"></span></div>
             <div class="grayout-value grayout-form">
                 <input type="checkbox" name="enable_warning_mail" id="enable_warning_mail">${_('Enabled')}
@@ -368,9 +368,9 @@ $(document).ready(function(){
 
             <div class="grayout-param">${_('Failure Script')}<span id="failure_script_help"></span></div>
             <div class="grayout-value grayout-form">
+                <input type="checkbox" name="enable_failure_script" id="enable_failure_script" /> ${_('Enable Script')}
                    <textarea cols="85" rows="3" name="failure_script" id="failure_script"></textarea>
             </div>
-
             <div class="grayout-param">${_('Enable Failure Mail')}<span id="enable_failure_mail_help"></span></div>
             <div class="grayout-value grayout-form">
                 <input type="checkbox" name="enable_failure_mail" id="enable_failure_mail">${_('Enabled')}
@@ -378,9 +378,9 @@ $(document).ready(function(){
 
             <div class="grayout-param">${_('Okay Script')}<span id="okay_script_help"></span></div>
             <div class="grayout-value grayout-form">
+                <input type="checkbox" name="enable_okay_script" id="enable_okay_script" /> ${_('Enable Script')}
                    <textarea cols="85" rows="3" name="okay_script" id="okay_script"></textarea>
             </div>
-
             <div class="grayout-param">${_('Enable Okay Mail')}<span id="enable_okay_mail_help"></span></div>
             <div class="grayout-value grayout-form">
                 <input type="checkbox" name="enable_okay_mail" id="enable_okay_mail">${_('Enabled')}