composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/5655-edit-object-in-modal' into develop

Browse Source 
# Conflicts:
#	pages/ajax.render.php
This commit is contained in:
Molkobain
2022-11-23 15:57:55 +01:00
parent 6af62c4a50 a553616ea2
commit a0a5037554
28 changed files with 4428 additions and 3860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/Application/TwigBase/Controller/Controller.php
View File

@@ -165,7 +165,7 @@ abstract class Controller
$this->CheckAccess();
$this->m_sOperation = utils::ReadParam('operation', $this->m_sDefaultOperation);
$sMethodName = 'Operation'.$this->m_sOperation;
$sMethodName = 'Operation'.utils::ToCamelCase($this->m_sOperation);
$oKPI = new ExecutionKPI();
$oKPI->ComputeAndReport('Starting operation '.$this->m_sOperation);
if (method_exists($this, $sMethodName))
@@ -201,7 +201,7 @@ abstract class Controller
$this->CheckAccess();
$this->m_sOperation = utils::ReadParam('operation', $this->m_sDefaultOperation);
$sMethodName = 'Operation'.$this->m_sOperation;
$sMethodName = 'Operation'.utils::ToCamelCase($this->m_sOperation);
if (method_exists($this, $sMethodName))
{
$this->$sMethodName();

4
sources/Application/WebPage/iTopWebPage.php
View File

@@ -529,9 +529,9 @@ JS
*/
public function SetContentLayout(PageContent $oLayout)
{
$oPrevContentLayout=$this->oContentLayout;
$oPrevContentLayout = $this->oContentLayout;
$this->oContentLayout = $oLayout;
foreach ($oPrevContentLayout->GetSubBlocks() as $oBlock){
foreach ($oPrevContentLayout->GetSubBlocks() as $oBlock) {
$this->AddUiBlock($oBlock);
}