4.6.0

infofabrik · May 22, 2023 · 2120235 · 2120235
1 parent 4381948
commit 2120235
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/src/net/datenwerke/gxtdto/client/utilityservices/UtilsUIService.java b/src/net/datenwerke/gxtdto/client/utilityservices/UtilsUIService.java
@@ -2,6 +2,8 @@
 
 import com.google.gwt.user.client.ui.Widget;
 
+import net.datenwerke.rs.theme.client.icon.BaseIcon;
+
 public interface UtilsUIService {
 
    public void redirect(String url);
@@ -20,6 +22,7 @@ public interface UtilsUIService {
 
    String guessUserTimezone();
 
-   void showHtmlPopupWindows(final String title, final String html, final boolean maximize);
+   void showHtmlPopupWindows(final String title, final String html, final boolean maximize, BaseIcon icon,
+         boolean collapsible, boolean titleCollapse, boolean maximizable, boolean resizable);
 
 }
diff --git a/src/net/datenwerke/gxtdto/client/utilityservices/UtilsUIServiceImpl.java b/src/net/datenwerke/gxtdto/client/utilityservices/UtilsUIServiceImpl.java
@@ -13,6 +13,7 @@
 import net.datenwerke.gxtdto.client.baseex.widget.btn.DwTextButton;
 import net.datenwerke.gxtdto.client.baseex.widget.window.SimpleDialogWindow;
 import net.datenwerke.gxtdto.client.locale.BaseMessages;
+import net.datenwerke.rs.theme.client.icon.BaseIcon;
 
 public class UtilsUIServiceImpl implements UtilsUIService {
 
@@ -83,23 +84,30 @@ public void triggerDownload(String url) {
          iframeLoadHandler.removeHandler();
          String content = getIFrameContent(GWT_DOWNLOAD_FRAME);
          String title = getIFrameTitle(GWT_DOWNLOAD_FRAME);
-         showHtmlPopupWindows(title, content, false);
+         showHtmlPopupWindows(title, content, false, null, false, false, false, false);
       });
 
       downloadFrame.setUrl(url);
    }
 
    @Override
-   public void showHtmlPopupWindows(final String title, final String html, final boolean maximize) {
+   public void showHtmlPopupWindows(final String title, final String html, final boolean maximize, BaseIcon icon,
+         boolean collapsible, boolean titleCollapse, boolean maximizable, boolean resizable) {
       SimpleDialogWindow popup = new SimpleDialogWindow() {
 
          @Override
          protected void initializeUi() {
-
             /* create window */
             setWidth(700);
             setHeading(title);
             setHeight(550);
+
+            if (null != icon)
+               setHeaderIcon(icon);
+            setCollapsible(collapsible);
+            setTitleCollapse(titleCollapse);
+            setMaximizable(maximizable);
+            setResizable(resizable);
 
             setWidget(asIframe(html));
 

diff --git a/src/net/datenwerke/rs/ReportServerServiceConfig.java b/src/net/datenwerke/rs/ReportServerServiceConfig.java
@@ -260,7 +260,7 @@ public class ReportServerServiceConfig extends DwGwtFrameworkBase {
 
    private final Logger logger = LoggerFactory.getLogger(getClass().getName());
 
-   public static final String CODE_VERSION = "2023-04-20-14-10-11";
+   public static final String CODE_VERSION = "2023-05-22-12-11-10";
 
    public static final String ENTERPRISE_MODULE_LOCATION = "net.datenwerke.rsenterprise.main.service.RsEnterpriseModule";
    private static final String ENTERPRISE_MODULE_LOAD_MODULE_METHOD = "getEnterpriseModules";

diff --git a/...atenwerke/rs/base/client/reportengines/table/prefilter/propertywidgets/PreFilterView.java b/...atenwerke/rs/base/client/reportengines/table/prefilter/propertywidgets/PreFilterView.java
@@ -678,7 +678,7 @@ public void onFailure(Throwable caught) {
                   public void onSuccess(String result) {
                      mainPanel.unmask();
                      utilsUIServiceProvider.get().showHtmlPopupWindows(PreFilterMessages.INSTANCE.preFilterHeading(),
-                           result, true);
+                           result, true, BaseIcon.SITEMAP, false, false, true, true);
                   }
 
                   @Override