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

N°659 Console & Portal now we have same object save error messages and sessionmessages

Browse Source 
* create new CoreCannotSaveException
* throw this exception in DBInsertNoReload/DBUpdate if CheckToWrite fails
* console : change UI.php code to catch this exception instead of calling CheckToWrite itself (was called twice :(( )
* portal : specific catch for the new exception
* portal : get and displays session messages
This commit is contained in:
Pierre Goiffon
2018-10-19 15:09:31 +02:00
parent 027b0fcff7
commit def4c54d26
8 changed files with 231 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
core/dbobject.class.php
View File

@@ -1905,8 +1905,18 @@ abstract class DBObject implements iDisplay
return $this->m_iKey;
}
// Insert of record for the new object into the database
// Returns the key of the newly created object
/**
* Insert of record for the new object into the database
*
* @return int key of the newly created object
* @throws \ArchivedObjectException
* @throws \CoreCannotSaveObjectException if {@link CheckToWrite()} returns issues
* @throws \CoreException
* @throws \CoreUnexpectedValue
* @throws \CoreWarning
* @throws \MySQLException
* @throws \OQLException
*/
public function DBInsertNoReload()
{
if ($this->m_bIsInDB)
@@ -1940,8 +1950,7 @@ abstract class DBObject implements iDisplay
list($bRes, $aIssues) = $this->CheckToWrite();
if (!$bRes)
{
$sIssues = implode(', ', $aIssues);
throw new CoreException("Object not following integrity rules", array('issues' => $sIssues, 'class' => get_class($this), 'id' => $this->GetKey()));
throw new CoreCannotSaveObjectException(array('issues' => $aIssues, 'class' => get_class($this), 'id' => $this->GetKey()));
}
// Stop watches
@@ -2152,7 +2161,13 @@ abstract class DBObject implements iDisplay
$this->m_iKey = self::GetNextTempId(get_class($this));
}
// Update a record
/**
* Update an object in DB
*
* @return int object key
* @throws \CoreException
* @throws \CoreCannotSaveObjectException if {@link CheckToWrite()} returns issues
*/
public function DBUpdate()
{
if (!$this->m_bIsInDB)
@@ -2205,8 +2220,7 @@ abstract class DBObject implements iDisplay
list($bRes, $aIssues) = $this->CheckToWrite();
if (!$bRes)
{
$sIssues = implode(', ', $aIssues);
throw new CoreException("Object not following integrity rules", array('issues' => $sIssues, 'class' => get_class($this), 'id' => $this->GetKey()));
throw new CoreCannotSaveObjectException(array('issues' => $aIssues, 'class' => get_class($this), 'id' => $this->GetKey()));
}
// Save the original values (will be reset to the new values when the object get written to the DB)
@@ -2326,13 +2340,19 @@ abstract class DBObject implements iDisplay
$this->RecordAttChanges($aChanges, $aOriginalValues);
}
}
catch (Exception $e)
catch (CoreCannotSaveObjectException $e)
{
unset($aUpdateReentrance[$sKey]);
throw $e;
}
catch (Exception $e)
{
throw $e;
}
finally
{
unset($aUpdateReentrance[$sKey]);
}
unset($aUpdateReentrance[$sKey]);
return $this->m_iKey;
}
@@ -2342,7 +2362,13 @@ abstract class DBObject implements iDisplay
return $this->DBUpdate();
}
// Make the current changes persistent - clever wrapper for Insert or Update
/**
* Make the current changes persistent - clever wrapper for Insert or Update
*
* @return int
* @throws \CoreCannotSaveObjectException
* @throws \CoreException
*/
public function DBWrite()
{
if ($this->m_bIsInDB)