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

Merge remote-tracking branch 'origin/support/2.7' into develop

Browse Source 
# Conflicts:
#	application/transaction.class.inc.php
#	application/ui.extkeywidget.class.inc.php
#	composer.json
#	composer.lock
#	js/utils.js
#	lib/composer/InstalledVersions.php
#	lib/composer/installed.json
#	lib/composer/installed.php
#	lib/pear/archive_tar/Archive/Tar.php
#	lib/pear/archive_tar/package.xml
#	setup/wizardsteps.class.inc.php
#	sources/Controller/AjaxRenderController.php
This commit is contained in:
Pierre Goiffon
2021-10-18 14:44:34 +02:00
parent 1d28bbe3f4 8ea5be4ead
commit 347cbca5cf
20 changed files with 468 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
application/transaction.class.inc.php
View File

@@ -27,8 +27,6 @@ use Combodo\iTop\Application\Helper\Session;
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
class privUITransaction
{
/**
@@ -271,27 +269,26 @@ class privUITransactionFile
/**
* Removes the transaction specified by its id
* @param int $id The Identifier (as returned by GetNewTransactionId) of the transaction to be removed.
* @return void
* @return bool true if the token can be removed
*/
public static function RemoveTransaction($id)
{
$bSuccess = true;
$sFilepath = APPROOT.'data/transactions/'.$id;
clearstatcache(true, $sFilepath);
if(!file_exists($sFilepath))
{
if (!file_exists($sFilepath)) {
$bSuccess = false;
self::Error("RemoveTransaction: Transaction '$id' not found. Pending transactions for this user:\n".implode("\n", self::GetPendingTransactions()));
self::Error("RemoveTransaction: Transaction '$id' not found. Pending transactions for this user:\n"
.implode("\n", self::GetPendingTransactions()));
} else {
$bSuccess = @unlink($sFilepath);
}
$bSuccess = @unlink($sFilepath);
if (!$bSuccess)
{
if (!$bSuccess) {
self::Error('RemoveTransaction: FAILED to remove transaction '.$id);
}
else
{
} else {
self::Info('RemoveTransaction: OK '.$id);
}
return $bSuccess;
}

4
application/ui.extkeywidget.class.inc.php
View File

@@ -703,14 +703,14 @@ JS
HTML
);
$sDialogTitle = addslashes($sTitle);
$sDialogTitleSanitized = utils::HtmlToText($sTitle);
$oPage->add_ready_script(<<<JS
$('#ac_dlg_{$this->iId}').dialog({
width: $(window).width()*0.8,
height: $(window).height()*0.8,
autoOpen: false,
modal: true,
title: '$sDialogTitle',
title: '$sDialogTitleSanitized',
resizeStop: oACWidget_{$this->iId}.UpdateSizes,
close: oACWidget_{$this->iId}.OnClose,
buttons: [