[checkmk-commits] Check_MK Git: check_mk: FIX Removed CSV export icon from availability views

Module: check_mk Branch: master Commit: f891e3aea8b4eb3ccef643a5b13ea5580dda23d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f891e3aea8b4eb… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Mon Dec 16 09:34:55 2013 +0100 FIX Removed CSV export icon from availability views The "Export as CSV" links on availability views resulted in broken pages and no exported data. The CSV export has not been created for those views yet, so the export icon has been removed for now. --- .bugs/834 | 7 +++++-- .werks/325 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.bugs/834 b/.bugs/834 index ba1b624..caf8060 100644 --- a/.bugs/834 +++ b/.bugs/834 @@ -1,8 +1,11 @@ Title: CSV Export for reporting Component: multisite -State: open +Class: bug +State: done Date: 2013-10-30 10:21:43 Targetversion: 1.2.3i5 -Class: bug Clicking on export to csv does not work. + +2013-12-16 09:32:36: changed state open -> done +CSV export for availability has never been created. Simply removed the CSV export icon from those views diff --git a/.werks/325 b/.werks/325 new file mode 100644 index 0000000..29cd78b --- /dev/null +++ b/.werks/325 @@ -0,0 +1,10 @@ +Title: Removed CSV export icon from availability views +Level: 1 +Component: multisite +Version: 1.2.3i8 +Date: 1387182799 +Class: fix + +The "Export as CSV" links on availability views resulted in broken pages and no exported +data. The CSV export has not been created for those views yet, so the export icon has +been removed for now. diff --git a/ChangeLog b/ChangeLog index bd21c90..b06f9dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ * 0239 FIX: Fixed incorrect html formatting when displaying host or service comments... * 0307 FIX: Increased performance of multisite GUI with a large userbase... * 0312 FIX: Hiding views related to not existing datasources, like the EC now... + * 0325 FIX: Removed CSV export icon from availability views... WATO: * 0308 Multisite can now set rotation view permissions for NagVis... diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index b9374a7..a9fb144 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -810,7 +810,7 @@ class html: h += '<a target="_top" href="%s"><img class=statusicon src="images/status_pageurl.png" title="%s"></a>\n' % \ ("index.py?" + self.urlencode_vars([("start_url", self.makeuri([]))]), _("URL to this page including sidebar")) - if self.myfile == "view": + if self.myfile == "view" and self.var('mode') != 'availability': # h += '<a target="_top" href="%s"><img class=statusicon src="images/status_frameurl.png" title="%s"></a>\n' % \ # (self.makeuri([("output_format", "json_export")]), _("Export as JSON")) h += '<a target="_top" href="%s"><img class=statusicon src="images/icon_download_csv.png" title="%s"></a>\n' % \