Merge pull request #3019 from Mips2648/fix-eqlogic-delete-confirmation

Fix eqlogic delete confirmation

Author: Sekiro-kost

core/ajax/eqLogic.ajax.php

@@ -25,8 +25,8 @@
 	}
 
 	ajax::init(array('uploadImage'));
-  
-  	if (init('action') == 'uploadImage') {
+
+	if (init('action') == 'uploadImage') {
 		if (!isConnect('admin')) {
 			throw new Exception(__('401 - Accès non autorisé', __FILE__));
 		}
@@ -408,12 +408,15 @@
 		if (isset($used['eqLogic' . $eqLogic->getId()])) {
 			unset($used['eqLogic' . $eqLogic->getId()]);
 		}
+		if (isset($used['object' . $eqLogic->getObject_id()])) {
+			unset($used['object' . $eqLogic->getObject_id()]);
+		}
 		foreach (($eqLogic->getCmd()) as $cmd) {
 			if (isset($used['cmd' . $cmd->getId()])) {
 				unset($used['cmd' . $cmd->getId()]);
 			}
 			$cmdData = array('node' => array(), 'link' => array());
-			$cmdData = $cmd->getLinkData($cmdData, 0, 2);
+			$cmdData = $cmd->getLinkData($cmdData, 0, 2, null, false);
 			if (isset($cmdData['node']['eqLogic' . $eqLogic->getId()])) {
 				unset($cmdData['node']['eqLogic' . $eqLogic->getId()]);
 			}
@@ -422,6 +425,10 @@
 			}
 			if (count($cmdData['node']) > 0) {
 				foreach ($cmdData['node'] as $name => $data) {
+					if (cmd::byId(str_replace('cmd', '', $data['id']))->getEqLogic_id() == $eqLogic->getId()) {
+						continue;
+					}
+
 					$data['sourceName'] = $cmd->getName();
 					$used[$name . $cmd->getName()] = $data;
 				}

core/class/cmd.class.php

@@ -992,10 +992,10 @@ public function formatValue($_value, $_quote = false) {
 			$_value = 0;
 		}
 		if (trim($_value) == '' && $_value !== false && $_value !== 0) {
-			if($this->getSubType() == 'numeric'){
+			if ($this->getSubType() == 'numeric') {
 				return 0;
 			}
-			if($this->getSubType() == 'binary'){
+			if ($this->getSubType() == 'binary') {
 				return 0;
 			}
 			return '';
@@ -2812,7 +2812,7 @@ public function exportApi() {
 		return $return;
 	}
 
-	public function getLinkData(&$_data = array('node' => array(), 'link' => array()), $_level = 0, $_drill = null) {
+	public function getLinkData(&$_data = array('node' => array(), 'link' => array()), $_level = 0, $_drill = null, $_include_use = true) {
 		if ($_drill === null) {
 			$_drill = config::byKey('graphlink::cmd::drill');
 		}
@@ -2838,7 +2838,6 @@ public function getLinkData(&$_data = array('node' => array(), 'link' => array()
 			'url' => $this->getEqLogic()->getLinkToConfiguration(),
 		);
 		$usedBy = $this->getUsedBy();
-		$use = $this->getUse();
 		addGraphLink($this, 'cmd', $usedBy['scenario'], 'scenario', $_data, $_level, $_drill);
 		foreach ($usedBy['plugin'] as $key => $value) {
 			addGraphLink($this, 'cmd', $value, $key, $_data, $_level, $_drill);
@@ -2849,18 +2848,21 @@ public function getLinkData(&$_data = array('node' => array(), 'link' => array()
 		addGraphLink($this, 'cmd', $usedBy['plan'], 'plan', $_data, $_level, $_drill, array('dashvalue' => '2,6', 'lengthfactor' => 0.6));
 		addGraphLink($this, 'cmd', $usedBy['plan3d'], 'plan3d', $_data, $_level, $_drill, array('dashvalue' => '2,6', 'lengthfactor' => 0.6));
 		addGraphLink($this, 'cmd', $usedBy['view'], 'view', $_data, $_level, $_drill, array('dashvalue' => '2,6', 'lengthfactor' => 0.6));
-		addGraphLink($this, 'cmd', $use['scenario'], 'scenario', $_data, $_level, $_drill);
-		addGraphLink($this, 'cmd', $use['eqLogic'], 'eqLogic', $_data, $_level, $_drill);
-		addGraphLink($this, 'cmd', $use['cmd'], 'cmd', $_data, $_level, $_drill);
-		addGraphLink($this, 'cmd', $use['dataStore'], 'dataStore', $_data, $_level, $_drill);
+		if ($_include_use) {
+			$use = $this->getUse();
+			addGraphLink($this, 'cmd', $use['scenario'], 'scenario', $_data, $_level, $_drill);
+			addGraphLink($this, 'cmd', $use['eqLogic'], 'eqLogic', $_data, $_level, $_drill);
+			addGraphLink($this, 'cmd', $use['cmd'], 'cmd', $_data, $_level, $_drill);
+			addGraphLink($this, 'cmd', $use['dataStore'], 'dataStore', $_data, $_level, $_drill);
+		}
 		addGraphLink($this, 'cmd', $this->getEqLogic(), 'eqLogic', $_data, $_level, $_drill, array('dashvalue' => '1,0', 'lengthfactor' => 0.6));
 		return $_data;
 	}
 
 	public function getUsedBy($_array = false) {
 		$return = array('cmd' => array(), 'eqLogic' => array(), 'scenario' => array(), 'plan' => array(), 'view' => array());
 		$cmds = array_merge(self::searchConfiguration('#' . $this->getId() . '#'), cmd::byValue($this->getId()));
-		if(is_array($cmds) && count($cmds) > 0){
+		if (is_array($cmds) && count($cmds) > 0) {
 			foreach ($cmds as $cmd) {
 				$return['cmd'][$cmd->getId()] = $cmd;
 			}

core/js/plugin.template.js

@@ -411,7 +411,7 @@ if (!jeeFrontEnd.pluginTemplate) {
           success: function(data) {
             var text = '{{Êtes-vous sûr de vouloir supprimer l\'équipement}} ' + textEqtype + ' <b>' + document.querySelector('.eqLogicAttr[data-l1key="name"]').jeeValue() + '</b> ?'
             if (Object.keys(data).length > 0) {
-              text += ' </br> {{Il est utilisé par ou utilise :}}</br>'
+              text += ' </br> {{Il est utilisé par:}}</br>'
               var complement = null
               for (var i in data) {
                 complement = ''