diff -ur ./prewikka.orig/templates/MessageListing.tmpl ./prewikka/templates/MessageListing.tmpl --- ./prewikka.orig/templates/MessageListing.tmpl 2007-04-11 09:20:45.000000000 -0400 +++ ./prewikka/templates/MessageListing.tmpl 2007-07-24 00:06:47.139178463 -0400 @@ -2,7 +2,143 @@ #extends prewikka.templates.ClassicLayout #def layout_start_hook -
+ + #for $name, $value in $hidden_parameters #end for @@ -99,6 +235,25 @@ + + $_("Refresh") + + + #if $auto_apply_enable + #set $enabled="checked=\"checked\"" + #set $disabled="" + #else: + #set $enabled="" + #set $disabled="disabled=\"disabled\"" + #end if + + + + 0:00/ + Enable + + + @@ -171,3 +326,16 @@ #filter Filter #end filter #end block menu_extra_content + +#block body + +
+
+
$prewikka.software
+
$prewikka.place
+
$prewikka.title
+
+ $toplayout_content +
+ +#end block body diff -ur ./prewikka.orig/views/alertlisting.py ./prewikka/views/alertlisting.py --- ./prewikka.orig/views/alertlisting.py 2007-07-11 05:31:14.000000000 -0400 +++ ./prewikka/views/alertlisting.py 2007-07-24 00:03:51.305158254 -0400 @@ -1059,6 +1059,8 @@ self.dataset["analyzer_aggregations"] = ANALYZER_AGGREGATIONS def render(self): + MessageListing.render(self) + self._deleteMessages() self._setDatasetConstants() diff -ur ./prewikka.orig/views/heartbeatlisting.py ./prewikka/views/heartbeatlisting.py --- ./prewikka.orig/views/heartbeatlisting.py 2007-05-18 09:31:23.000000000 -0400 +++ ./prewikka/views/heartbeatlisting.py 2007-07-24 00:03:51.309158482 -0400 @@ -106,6 +106,8 @@ self.env.idmef_db.deleteHeartbeat(ident) def render(self): + MessageListing.render(self) + self._deleteMessages() criteria = [ ] start = end = None diff -ur ./prewikka.orig/views/messagelisting.py ./prewikka/views/messagelisting.py --- ./prewikka.orig/views/messagelisting.py 2007-06-13 09:37:34.000000000 -0400 +++ ./prewikka/views/messagelisting.py 2007-07-24 00:03:51.317158938 -0400 @@ -109,6 +109,10 @@ self.optional("delete", list, [ ]) self.optional("apply", str) + self.optional("auto_apply_hidden", str, default="0:00", save=True) + self.optional("auto_apply_enable", str, save=True) + self.optional("auto_apply_value", str) + # submit with an image passes the x and y coordinate values # where the image was clicked self.optional("x", int) @@ -132,13 +136,9 @@ if not self["timezone"] in ("frontend_localtime", "sensor_localtime", "utc"): raise view.InvalidValueError("timezone", self["timezone"]) - # remove the bulshit - try: - del self["x"] - del self["y"] - except KeyError: - pass - + if not self.has_key("auto_apply_enable"): + user.delConfigValue(view_name, "auto_apply_enable") + return do_load @@ -211,11 +211,29 @@ def _adjustCriteria(self, criteria): pass + def render(self): + self.dataset["auto_apply_hidden"] = self.parameters.get("auto_apply_hidden", "0:00") + self.dataset["auto_apply_enable"] = self.parameters.get("auto_apply_enable", None) + + # We need to remove x/y from parameters, so that they aren't used for link. + self.dataset["hidden_parameters"] = [ ] + + if self.parameters.has_key("x"): + self.dataset["hidden_parameters"].append( ("x", self.parameters.pop("x")) ) + else: + self.dataset["hidden_parameters"].append( ("x", "") ) + + if self.parameters.has_key("y"): + self.dataset["hidden_parameters"].append( ("y", self.parameters.pop("y")) ) + else: + self.dataset["hidden_parameters"].append( ("y", "") ) + def _setHiddenParameters(self): - self.dataset["hidden_parameters"] = [ [ "view", self.view_name ] ] + self.dataset["hidden_parameters"].append( ("view", self.view_name) ) + if self.parameters.has_key("timeline_end"): self.dataset["hidden_parameters"].append(("timeline_end", self.parameters["timeline_end"])) - + def _setTimelineNext(self, next): parameters = self.parameters - [ "offset" ] + { "timeline_end": int(next) } self.dataset["timeline.next"] = utils.create_link(self.view_name, parameters)