Merge branch 'master' of http://git.centreon.com/centreon

modules/CentreonConfigurationModule/controllers/CommandController.php

@@ -45,6 +45,8 @@ class CommandController extends \CentreonConfiguration\Controllers\ObjectAbstrac
     protected $objectClass = '\CentreonConfiguration\Models\Command';
     protected $datatableObject = '\CentreonConfiguration\Internal\CommandDatatable';
     
+    public static $relationMap = array();
+
     /**
      * List commands
      *

modules/CentreonConfigurationModule/controllers/ConnectorController.php

@@ -45,6 +45,8 @@ class ConnectorController extends \CentreonConfiguration\Controllers\ObjectAbstr
     
     public static $isDisableable = true;
     
+    public static $relationMap = array();
+
     /**
      * List connectors
      *

modules/CentreonConfigurationModule/install/forms/Command.xml

@@ -22,6 +22,16 @@
 		<field name="command_line" label="Command line" default_value="" advanced="0" type="textarea" parent_field="" mandatory="1">
           <help>The command line specifies the real command line, that is actually executed by Monitoring engine. Before execution, all valid macros are replaced with their respective values. To use the dollar sign (\$) on the command line, you have to escape it with another dollar sign (\$\$). A semicolon (;) is used as seperator for config file comments and must be worked around by setting a \$USER\$ macro to a semicolon and then referencing it here in place of the semicolon. If you want to pass arguments to commands during runtime, you can use \$ARGn\$ macros in the command line.</help>
         </field>
+		<field name="enable_shell" label="Enable shell" default_value="0" advanced="0" type="radio" parent_field="" mandatory="1">
+		  <attributes>
+            <choices>
+              <Yes>1</Yes>
+              <No>0</No>
+            </choices>
+		  </attributes>
+          <help>If your command requires shell features like pipes, redirections, globbing etc. check this box. If you are using Monitoring Engine this option cannot be disabled. Note that commands that require shell are slowing down the poller server.</help>
+		</field>
+	  </block>
         <block name="Commands linked to connector">
             <field name="connector_id" label="Connector" default_value="" advanced="0" type="select" parent_field="" mandatory="0">
             <attributes>
@@ -34,16 +44,6 @@
             <help>Connectors are run in background and execute specific commands without the need to execute a binary, thus enhancing performance. This feature is available in Centreon Engine (>= 1.3)</help>
             </field>
         </block>
-		<field name="enable_shell" label="Enable shell" default_value="0" advanced="0" type="radio" parent_field="" mandatory="1">
-		  <attributes>
-            <choices>
-              <Yes>1</Yes>
-              <No>0</No>
-            </choices>
-		  </attributes>
-          <help>If your command requires shell features like pipes, redirections, globbing etc. check this box. If you are using Monitoring Engine this option cannot be disabled. Note that commands that require shell are slowing down the poller server.</help>
-		</field>
-	  </block>
 	  <block name="Additional information">
 		<field name="command_comment" label="Comments" default_value="" advanced="0" type="textarea" parent_field="" mandatory="0"></field>
       </block>