svn commit: r1702443 - in /felix/trunk/webconsole/src/main: java/org/apache/felix/webconsole/internal/configuration/ConfigManager.java resources/res/ui/config.js resources/templates/config.html

[vv...@apache.org]

Author: vvalchev
Date: Fri Sep 11 12:26:00 2015
New Revision: 1702443

URL: http://svn.apache.org/r1702443
Log:
Fixed FELIX-5018 : [webconsole] "create factory configuration" link for config screen
https://issues.apache.org/jira/browse/FELIX-5018

Applied path provided by Balazs Zsoldos

Modified:
    felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigManager.java
    felix/trunk/webconsole/src/main/resources/res/ui/config.js
    felix/trunk/webconsole/src/main/resources/templates/config.html

Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigManager.java?rev=1702443&r1=1702442&r2=1702443&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigManager.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigManager.java Fri Sep 11 12:26:00 2015
@@ -53,6 +53,7 @@ public class ConfigManager extends Simpl
     static final String PID = "pid"; //$NON-NLS-1$
     static final String FACTORY_PID = "factoryPid"; //$NON-NLS-1$
     static final String PLACEHOLDER_PID = "[Temporary PID replaced by real PID upon save]"; //$NON-NLS-1$
+    static final String FACTORY_CREATE = "factoryCreate"; //$NON-NLS-1$
 
     static final String ACTION_CREATE = "create"; //$NON-NLS-1$
     static final String ACTION_DELETE = "delete"; //$NON-NLS-1$
@@ -411,6 +412,8 @@ public class ConfigManager extends Simpl
         DefaultVariableResolver vars = ( ( DefaultVariableResolver ) WebConsoleUtil.getVariableResolver( request ) );
         vars.put( "__data__", json.toString() ); //$NON-NLS-1$
         vars.put( "selectedPid", pid != null ? pid : ""); //$NON-NLS-1$ //$NON-NLS-2$
+        boolean factoryCreate = "true".equals(request.getParameter(FACTORY_CREATE)); //$NON-NLS-1$
+        vars.put( "factoryCreate", Boolean.valueOf(factoryCreate)); //$NON-NLS-1$
         vars.put( "param.apply", ACTION_APPLY ); //$NON-NLS-1$
         vars.put( "param.create", ACTION_CREATE ); //$NON-NLS-1$
         vars.put( "param.unbind", ACTION_UNBIND ); //$NON-NLS-1$

Modified: felix/trunk/webconsole/src/main/resources/res/ui/config.js
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/res/ui/config.js?rev=1702443&r1=1702442&r2=1702443&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/res/ui/config.js (original)
+++ felix/trunk/webconsole/src/main/resources/res/ui/config.js Fri Sep 11 12:26:00 2015
@@ -695,5 +695,8 @@ $(document).ready(function() {
 	} else {
 		configContent.addClass('ui-helper-hidden');
 	}
-	if (selectedPid) configure(selectedPid);
+	if(selectedPid) {
+	  if(factoryCreate) configure(selectedPid, true);
+	  else configure(selectedPid);
+	}
 });
\ No newline at end of file

Modified: felix/trunk/webconsole/src/main/resources/templates/config.html
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/templates/config.html?rev=1702443&r1=1702442&r2=1702443&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/templates/config.html [UTF-8] (original)
+++ felix/trunk/webconsole/src/main/resources/templates/config.html [UTF-8] Fri Sep 11 12:26:00 2015
@@ -4,6 +4,7 @@
 // data
 var configData = ${__data__};
 var selectedPid = '${selectedPid}';
+var factoryCreate = ${factoryCreate};
 var i18n = { // i18n
 	stat_ok      : '${config.status.ok}', // "Configuration Admin Service is running.";
 	stat_missing : '${config.status.missing}', //"Configuration Admin Service is not installed/running."