[Dive4elements-commits] [PATCH 11 of 11] Merged

[Wald Commits]

# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1351576806 -3600
# Node ID 41cf1172825c10ab7c82f164a7f4567770ece362
# Parent  c74155ebe3ac2bcd3dfa119b11031aa937c42789
# Parent  4c2005e6ac6581c708842878db621b1a045a6e99
Merged.

diff -r c74155ebe3ac -r 41cf1172825c flys-artifacts/doc/conf/artifacts/gaugedischargecurve.xml
--- a/flys-artifacts/doc/conf/artifacts/gaugedischargecurve.xml	Tue Oct 30 06:59:33 2012 +0100
+++ b/flys-artifacts/doc/conf/artifacts/gaugedischargecurve.xml	Tue Oct 30 07:00:06 2012 +0100
@@ -13,7 +13,7 @@
                 </outputmode>
                 <outputmode name="computed_dischargecurve_at_export" description="output.computed_dischargecurve_at_export" mime-type="text/plain" type="export">
                     <facets>
-                        <facet name="gauge_discharge_curve_at_export" description="facet.gauge_discharge_curve_export.at"/>
+                        <facet name="at" description="facet.gauge_discharge_curve_export.at"/>
                     </facets>
                 </outputmode>
             </outputmodes>
diff -r c74155ebe3ac -r 41cf1172825c flys-artifacts/src/main/java/de/intevation/flys/artifacts/GaugeDischargeCurveArtifact.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/GaugeDischargeCurveArtifact.java	Tue Oct 30 06:59:33 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/GaugeDischargeCurveArtifact.java	Tue Oct 30 07:00:06 2012 +0100
@@ -46,7 +46,7 @@
     public static final String GAUGE_DISCHARGE_CURVE_FACET =
         "gauge_discharge_curve";
     public static final String GAUGE_DISCHARGE_CURVE_AT_EXPORT_FACET =
-        "gauge_discharge_curve_at_export";
+        "at";
     public static final String GAUGE_DISCHARGE_CURVE_OUT =
         "discharge_curve";
     public static final String GAUGE_DISCHARGE_CURVE_AT_EXPORT_OUT =
diff -r c74155ebe3ac -r 41cf1172825c flys-client/src/main/java/de/intevation/flys/client/client/ui/CollectionView.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/CollectionView.java	Tue Oct 30 06:59:33 2012 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/CollectionView.java	Tue Oct 30 07:00:06 2012 +0100
@@ -552,6 +552,7 @@
 
                 if (export.getFacet("csv") != null) {
                     hasCSV = true;
+                    parameterList.contractInfoPanel();
                 }
             }
         }
diff -r c74155ebe3ac -r 41cf1172825c flys-client/src/main/java/de/intevation/flys/client/client/ui/ParameterList.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/ParameterList.java	Tue Oct 30 06:59:33 2012 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/ParameterList.java	Tue Oct 30 07:00:06 2012 +0100
@@ -1002,5 +1002,15 @@
         }
     }
 
+    /**
+     * Allow to close all folds of the info panel.
+     * This is necessary e.g. if a csv result should be shown.
+     */
+    public void contractInfoPanel() {
+        if (infoPanel != null) {
+            infoPanel.contract();
+        }
+    }
+
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :