Incorrect working directory used to upload config file after changes in CUBA 7.2 #27

Author: zaharchenko

modules/gui/src/com/haulmont/addon/admintools/gui/config_loader/ConfigLoader.java

@@ -50,13 +50,16 @@ public class ConfigLoader extends AbstractWindow {
     protected Notifications notifications;
     @Inject
     protected Dialogs dialogs;
+    @Inject
+    private Label<String> helpLabel;
 
     protected Path configDir;
 
     @Override
     public void init(Map<String, Object> params) {
         super.init(params);
         configDir = Paths.get(configuration.getConfig(GlobalConfig.class).getConfDir()).getParent();
+        helpLabel.setValue(String.format(getMessage("helpMessage"), configuration.getConfig(GlobalConfig.class).getConfDir()));
     }
 
     public void apply() {

modules/gui/src/com/haulmont/addon/admintools/gui/config_loader/config-loader.xml

@@ -24,7 +24,7 @@
     <layout expand="vBox"
             spacing="true"
             width="100%">
-        <label id="helpLabel" value="msg://helpMessage"/>
+        <label id="helpLabel" htmlEnabled="true"/>
         <label id="helpLabel2" value="msg://helpMessage2"/>
         <hbox expand="configPathField"
               spacing="true"

modules/gui/src/com/haulmont/addon/admintools/gui/config_loader/messages.properties

@@ -23,5 +23,5 @@ dropZoneDescription = Drop file here
 fileNotUploaded = Please upload a configuration file
 configPath = Relative path
 pathValidMessage = Is not valid path "%s"
-helpMessage = File will be uploaded to a web application server in the config directory ./tomcat/conf/
+helpMessage = File will be uploaded to a web application server in the config directory <br><b>%s</b>
 helpMessage2 = You can specify a relative path in the field below.