diff --git a/build/docker/README.md b/build/docker/README.md index dc6147ef855..8fe44662bf5 100644 --- a/build/docker/README.md +++ b/build/docker/README.md @@ -1,12 +1,12 @@ -# How to use it ? +# How to use run Dolibarr with docker ? -This directory is experimental. Scope of its used is not clear and not documented. -If you are looking for a process to run Dolibarr as an official Docker image, you can find it on https://hub.docker.com/r/dolibarr/dolibarr - -# For experimental dev - TO REMOVE. +## For a fast run of a demo of the local version, you can build the docker image from this current repository by running -But if you want to execute the version of Dolibarr that is into this current directory as a docker process, you can do it with this commands. + +sudo docker-compose build + +sudo -s export HOST_USER_ID=$(id -u) export HOST_GROUP_ID=$(id -g) @@ -14,4 +14,10 @@ export MYSQL_ROOT_PWD=$(tr -dc A-Za-z0-9 create volume directory /var/documents ..." - mkdir -p /var/documents +if [ ! -d /var/www/documents ]; then + echo "[docker-run] => create volume directory /var/www/documents ..." + mkdir -p /var/www/documents fi -echo "[docker-run] => Set Permission to www-data for /var/documents" -chown -R www-data:www-data /var/documents +echo "[docker-run] => Set Permission to www-data for /var/www/documents" +chown -R www-data:www-data /var/www/documents echo "[docker-run] => update '${PHP_INI_DIR}/conf.d/dolibarr-php.ini'" cat < "${PHP_INI_DIR}/conf.d/dolibarr-php.ini" diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php index 762bb707a65..c097fa1e843 100644 --- a/htdocs/admin/modulehelp.php +++ b/htdocs/admin/modulehelp.php @@ -529,7 +529,7 @@ if ($mode == 'feature') { if (isset($objMod->module_parts) && isset($objMod->module_parts['triggers']) && $objMod->module_parts['triggers']) { $yesno = 'Yes'; } else { - $yesno = 'No'; + $yesno = ''.$langs->trans("No").''; } require_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php'; $interfaces = new Interfaces($db); diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 4b488971603..ed77ac897d1 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -12897,7 +12897,7 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u * @param string $elementType Element type (Value of $object->element or value of $object->element@$object->module). Example: * 'action', 'facture', 'project', 'project_task' or * 'myobject@mymodule' (or old syntax 'mymodule_myobject' like 'project_task') - * @return array{module:string,element:string,table_element:string,subelement:string,classpath:string,classfile:string,classname:string,dir_output:string} array('module'=>, 'classpath'=>, 'element'=>, 'subelement'=>, 'classfile'=>, 'classname'=>, 'dir_output'=>) + * @return array{module:string,element:string,table_element:string,subelement:string,classpath:string,classfile:string,classname:string,dir_output:string,dir_temp:string} array('module'=>, 'classpath'=>, 'element'=>, 'subelement'=>, 'classfile'=>, 'classname'=>, 'dir_output'=>, 'dir_temp'=>) * @see fetchObjectByElement(), getMultidirOutput() */ function getElementProperties($elementType) diff --git a/htdocs/core/upload_page.php b/htdocs/core/upload_page.php index fb571c2b99c..599e275af13 100644 --- a/htdocs/core/upload_page.php +++ b/htdocs/core/upload_page.php @@ -91,7 +91,7 @@ if ($action == 'uploadfile') { // Test on permission not required here. Done lat $permissiontoadd = $user->hasRight($module, $permlevel1, 'read'); $upload_dir = $dir_temp.'/import'; - var_dump($upload_dir); + include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php'; } @@ -203,13 +203,18 @@ $max = $maxfilesizearray['max']; $maxmin = $maxfilesizearray['maxmin']; $maxphptoshow = $maxfilesizearray['maxphptoshow']; $maxphptoshowparam = $maxfilesizearray['maxphptoshowparam']; +$out = ''; if ($maxmin > 0) { $out .= ''; // MAX_FILE_SIZE must precede the field type=file } $out .= '