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

N°4092 Setup : symlink option now always displayed if functionality enabled

Browse Source 
Previously we were also testing for flag presence.
In consequence the confirmation dialog when unchecking the option is also removed (we can enable back the option using the setup)
This commit is contained in:
Pierre Goiffon
2021-07-29 16:55:49 +02:00
parent f3c11e72cf
commit 83064d68c7
3 changed files with 47 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup/ajax.dataloader.php
View File

@@ -180,7 +180,7 @@ try
$sUseSymbolicLinks = Utils::ReadParam('bUseSymbolicLinks', false);
$bUseSymbolicLinks = ($sUseSymbolicLinks === 'true');
MFCompiler::SetUseSymbolicLinksFlag($bUseSymbolicLinks);
echo "toggle useSymbolicLInks file : $bUseSymbolicLinks";
echo "toggle useSymbolicLinks flag : $bUseSymbolicLinks";
break;
default:

64
setup/compiler.class.inc.php
View File

@@ -58,6 +58,8 @@ class MFCompiler
* If this file is present, then we will compile to symlink !
*
* @var string
*
* @since 3.0.0 N°4092
*/
public const USE_SYMBOLIC_LINKS_FILE_PATH = APPROOT.'data/.compilation-symlinks';
@@ -121,47 +123,63 @@ class MFCompiler
}
/**
* @param bool $bForce if true then will just check file existence
* @return bool if flag is present true, false otherwise
*
* @return bool possible return values :
* * always false if not in dev env
* * `symlink` function non existent : false
* * if flag is present true, false otherwise
*
* @uses utils::IsDevelopmentEnvironment()
* @uses \function_exists()
* @uses \file_exists()
* @uses USE_SYMBOLIC_LINKS_FILE_PATH
*
* @since 3.0.0
* @since 3.0.0 N°4092
*/
public static function IsUseSymbolicLinksFlagPresent(bool $bForce = false): bool
public static function IsUseSymbolicLinksFlagPresent(): bool
{
if (!$bForce) {
if (!utils::IsDevelopmentEnvironment()) {
return false;
}
return (file_exists(static::USE_SYMBOLIC_LINKS_FILE_PATH));
}
if (!function_exists('symlink')) {
return false;
}
/**
* This is to check if the functionality can be used. As this is really only useful for developers,
* this is strictly limited and not available on any iTop instance !
*
* @return bool Check that the symlinks flag can be used
* * always false if not in dev env
* * `symlink` function non-existent : false
* * true otherwise
*
* @uses utils::IsDevelopmentEnvironment()
* @uses \function_exists()
*
* @since 3.0.0 N°4092
*/
public static function IsUseSymbolicLinksFlagCanBeUsed(): bool
{
if (false === utils::IsDevelopmentEnvironment()) {
return false;
}
return (file_exists(static::USE_SYMBOLIC_LINKS_FILE_PATH));
if (false === function_exists('symlink')) {
return false;
}
return true;
}
/**
* @param bool $bUseSymbolicLinks
*
* @since 3.0.0 method creation
* @uses USE_SYMBOLIC_LINKS_FILE_PATH
*
* @since 3.0.0 N°4092
*/
public static function SetUseSymbolicLinksFlag(bool $bUseSymbolicLinks): void
{
$bHasUseSymlinksFile = static::IsUseSymbolicLinksFlagPresent(true);
if (!static::IsUseSymbolicLinksFlagCanBeUsed()) {
// functionality cannot be used, so we're doing nothing !
return;
}
$bIsUseSymlinksFlagPresent = (static::IsUseSymbolicLinksFlagPresent());
if ($bUseSymbolicLinks) {
if ($bHasUseSymlinksFile) {
if ($bIsUseSymlinksFlagPresent) {
return;
}
@@ -170,7 +188,7 @@ class MFCompiler
return;
}
if (!$bHasUseSymlinksFile) {
if (!$bIsUseSymlinksFlagPresent) {
return;
}
unlink(static::USE_SYMBOLIC_LINKS_FILE_PATH);
@@ -205,7 +223,7 @@ class MFCompiler
{
if (is_null($bUseSymbolicLinks)) {
$bUseSymbolicLinks = false;
if (self::IsUseSymbolicLinksFlagPresent()) {
if (self::IsUseSymbolicLinksFlagCanBeUsed() && self::IsUseSymbolicLinksFlagPresent()) {
// We are only overriding the useSymLinks option if the consumer didn't specify anything
// The toolkit always send this parameter for example, but not the Designer Connector
$bUseSymbolicLinks = true;

15
setup/wizardsteps.class.inc.php
View File

@@ -943,7 +943,7 @@ EOF
}}
/**
* Miscellaneous Parameters (URL, Sample Data)
* Miscellaneous Parameters (URL, Sample Data) when installing from scratch
*/
class WizStepMiscParams extends WizardStep
{
@@ -1162,22 +1162,17 @@ class WizStepUpgradeMiscParams extends WizardStep
EOF
);
if (MFCompiler::IsUseSymbolicLinksFlagPresent()) {
if (MFCompiler::IsUseSymbolicLinksFlagCanBeUsed()) {
$sChecked = (MFCompiler::IsUseSymbolicLinksFlagPresent()) ? ' checked' : '';
$oPage->add('<fieldset>');
$oPage->add('<legend>Dev parameters</legend>');
$oPage->p('<input id="use-symbolic-links" type="checkbox" checked><label for="use-symbolic-links">&nbsp;Create symbolic links instead of creating a copy in env-production (useful for debugging extensions)');
$oPage->p('<input id="use-symbolic-links" type="checkbox"'.$sChecked.'><label for="use-symbolic-links">&nbsp;Create symbolic links instead of creating a copy in env-production (useful for debugging extensions)');
$oPage->add('</fieldset>');
$oPage->add_ready_script(<<<'JS'
$("#use-symbolic-links").on("click", function() {
var $this = $(this),
bUseSymbolicLinks = $this.prop("checked");
if (!bUseSymbolicLinks){
if (!window.confirm("This will disable symbolic links generation.\nYou'll need the toolkit to restore this option.\n\nAre you sure ?")) {
$this.prop("checked", true);
return;
}
}
var sAuthent = $('#authent_token').val();
var oAjaxParams = { operation: 'toggle_use_symbolic_links', bUseSymbolicLinks: bUseSymbolicLinks, authent: sAuthent};
$.post(GetAbsoluteUrlAppRoot()+'setup/ajax.dataloader.php', oAjaxParams);