lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename var

Browse Source
This commit is contained in:
John BOTELLA 2021-11-02 14:07:36 +01:00
parent b98efd7e44
commit bbe71c9c32
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
htdocs/core/class/html.formsetup.class.php
View File

@ -28,7 +28,7 @@ class formSetup
public $db; public $db;
/** @var formSetupItem[] */ /** @var formSetupItem[] */
public $params = array(); public $items = array();
/** /**
* @var int * @var int
@ -100,7 +100,7 @@ class formSetup
$this->sortingItems(); $this->sortingItems();
$out .= '<tbody>'; $out .= '<tbody>';
foreach ($this->params as $item) { foreach ($this->items as $item) {
$out .= $this->generateLineOutput($item, $editMode); $out .= $this->generateLineOutput($item, $editMode);
} }
$out .= '</tbody>'; $out .= '</tbody>';
@ -117,13 +117,13 @@ class formSetup
public function saveConfFromPost($noMessageInUpdate = false) public function saveConfFromPost($noMessageInUpdate = false)
{ {
if (empty($this->params)) { if (empty($this->items)) {
return null; return null;
} }
$this->db->begin(); $this->db->begin();
$error = 0; $error = 0;
foreach ($this->params as $item) { foreach ($this->items as $item) {
$res = $item->setValueFromPost(); $res = $item->setValueFromPost();
if ($res > 0) { if ($res > 0) {
$item->saveConfValue(); $item->saveConfValue();
@ -234,7 +234,7 @@ class formSetup
$item->cssClass = $params['css']; $item->cssClass = $params['css'];
} }
$this->params[$item->confKey] = $item; $this->items[$item->confKey] = $item;
return true; return true;
} }
@ -247,7 +247,7 @@ class formSetup
public function exportItemsAsParamsArray() public function exportItemsAsParamsArray()
{ {
$arrayofparameters = array(); $arrayofparameters = array();
foreach ($this->params as $key => $item) { foreach ($this->items as $key => $item) {
$arrayofparameters[$item->confKey] = array( $arrayofparameters[$item->confKey] = array(
'type' => $item->getType(), 'type' => $item->getType(),
'enabled' => $item->enabled 'enabled' => $item->enabled
@ -265,8 +265,8 @@ class formSetup
public function reloadConfs() public function reloadConfs()
{ {
if (!array($this->params)) { return false; } if (!array($this->items)) { return false; }
foreach ($this->params as $item) { foreach ($this->items as $item) {
$item->reloadValueFromConf(); $item->reloadValueFromConf();
} }
@ -294,8 +294,8 @@ class formSetup
// try to get rank from target column, this will override item->rank // try to get rank from target column, this will override item->rank
if (!empty($targetItemKey)) { if (!empty($targetItemKey)) {
if (isset($this->params[$targetItemKey])) { if (isset($this->items[$targetItemKey])) {
$targetItem = $this->params[$targetItemKey]; $targetItem = $this->items[$targetItemKey];
$item->rank = $targetItem->rank; // $targetItem->rank will be increase after $item->rank = $targetItem->rank; // $targetItem->rank will be increase after
if ($targetItem->rank >= 0 && $insertAfterTarget) { if ($targetItem->rank >= 0 && $insertAfterTarget) {
$item->rank++; $item->rank++;
@ -303,7 +303,7 @@ class formSetup
} }
// calc new rank for each item to make place for new item // calc new rank for each item to make place for new item
foreach ($this->params as $fItem) { foreach ($this->items as $fItem) {
if ($item->rank <= $fItem->rank) { if ($item->rank <= $fItem->rank) {
$fItem->rank = $fItem->rank + 1; $fItem->rank = $fItem->rank + 1;
$this->setItemMaxRank($fItem->rank); // set new max rank if needed $this->setItemMaxRank($fItem->rank); // set new max rank if needed
@ -311,8 +311,8 @@ class formSetup
} }
} }
$this->params[$item->confKey] = $item; $this->items[$item->confKey] = $item;
return $this->params[$item->confKey]; return $this->items[$item->confKey];
} }
/** /**
@ -322,7 +322,7 @@ class formSetup
public function sortingItems() public function sortingItems()
{ {
// Sorting // Sorting
return uasort($this->params, array($this, 'itemSort')); return uasort($this->items, array($this, 'itemSort'));
} }
/** /**
@ -331,7 +331,7 @@ class formSetup
*/ */
public function getCurentItemMaxRank($cache = true) public function getCurentItemMaxRank($cache = true)
{ {
if (empty($this->params)) { if (empty($this->items)) {
return 0; return 0;
} }
@ -340,7 +340,7 @@ class formSetup
} }
$this->maxItemRank = 0; $this->maxItemRank = 0;
foreach ($this->params as $item) { foreach ($this->items as $item) {
$this->maxItemRank = max($this->maxItemRank, $item->rank); $this->maxItemRank = max($this->maxItemRank, $item->rank);
} }
@ -367,10 +367,10 @@ class formSetup
*/ */
public function getLineRank($itemKey) public function getLineRank($itemKey)
{ {
if (!isset($this->params[$itemKey]->rank)) { if (!isset($this->items[$itemKey]->rank)) {
return -1; return -1;
} }
return $this->params[$itemKey]->rank; return $this->items[$itemKey]->rank;
} }

2
htdocs/modulebuilder/template/admin/setup.php
View File

@ -265,7 +265,7 @@ if ($action == 'edit') {
print '</form>'; print '</form>';
print '<br>'; print '<br>';
} else { } else {
if (!empty($formSetup->params)) { if (!empty($formSetup->items)) {
print $formSetup->generateOutput(); print $formSetup->generateOutput();
$setupnotempty++; $setupnotempty++;