From cc6f42f926c1af929f9670a699a448ba52fbdf39 Mon Sep 17 00:00:00 2001
From: Lenin Rivas <53640168+leninrivas@users.noreply.github.com>
Date: Fri, 6 Jan 2023 12:34:45 -0500
Subject: [PATCH 1/3] Add new constant PROPALE_ADDON_NOTE_PUBLIC_DEFAULT
Add constant default public note
---
htdocs/comm/propal/card.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 5fb464a6e8e..7b58f93d7b8 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1928,7 +1928,7 @@ if ($action == 'create') {
print '
';
print '| '.$langs->trans('NotePublic').' | ';
print '';
- $note_public = $object->getDefaultCreateValueFor('note_public', (!empty($objectsrc) ? $objectsrc->note_public : null));
+ $note_public = $object->getDefaultCreateValueFor('note_public', (!empty($objectsrc) ? $objectsrc->note_public : (!empty($conf->global->PROPALE_ADDON_NOTE_PUBLIC_DEFAULT) ? $conf->global->PROPALE_ADDON_NOTE_PUBLIC_DEFAULT : null)));
$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
From 5be0bf17368233de9f858600ce174ef2751afcf1 Mon Sep 17 00:00:00 2001
From: Lenin Rivas <53640168+leninrivas@users.noreply.github.com>
Date: Fri, 6 Jan 2023 13:17:19 -0500
Subject: [PATCH 2/3] FIX line brak public note default
---
htdocs/comm/propal/card.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 7b58f93d7b8..39632e14e64 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -15,6 +15,7 @@
* Copyright (C) 2018-2021 Frédéric France
* Copyright (C) 2020 Nicolas ZABOURI
* Copyright (C) 2022 Gauthier VERDOL
+ * Copyright (C) 2023 Lenin Rivas
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -1928,7 +1929,7 @@ if ($action == 'create') {
print '';
print '| '.$langs->trans('NotePublic').' | ';
print '';
- $note_public = $object->getDefaultCreateValueFor('note_public', (!empty($objectsrc) ? $objectsrc->note_public : (!empty($conf->global->PROPALE_ADDON_NOTE_PUBLIC_DEFAULT) ? $conf->global->PROPALE_ADDON_NOTE_PUBLIC_DEFAULT : null)));
+ $note_public = $object->getDefaultCreateValueFor('note_public', (!empty($objectsrc) ? $objectsrc->note_public : (!empty($conf->global->PROPALE_ADDON_NOTE_PUBLIC_DEFAULT) ? $conf->global->PROPALE_ADDON_NOTE_PUBLIC_DEFAULT : null)), 'restricthtml');
$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
From 75d177f03a8161a70cb64a19682837078434c1b9 Mon Sep 17 00:00:00 2001
From: Lenin Rivas <53640168+leninrivas@users.noreply.github.com>
Date: Fri, 6 Jan 2023 13:23:16 -0500
Subject: [PATCH 3/3] New param $type getDefaultCreateValueFor
New param $type in fucntion getDefaultCreateValueFor
---
htdocs/core/class/commonobject.class.php | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 48e5124f213..5b6dac99a4b 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -16,6 +16,7 @@
* Copyright (C) 2018 Josep Lluís Amador
* Copyright (C) 2021 Gauthier VERDOL
* Copyright (C) 2021 Grégory Blémand
+ * Copyright (C) 2023 Lenin Rivas
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -5738,15 +5739,16 @@ abstract class CommonObject
*
* @param string $fieldname Name of field
* @param string $alternatevalue Alternate value to use
+ * @param string $type Type of data
* @return string|string[] Default value (can be an array if the GETPOST return an array)
**/
- public function getDefaultCreateValueFor($fieldname, $alternatevalue = null)
+ public function getDefaultCreateValueFor($fieldname, $alternatevalue = null, $type = 'alphanohtml')
{
global $conf, $_POST;
// If param here has been posted, we use this value first.
if (GETPOSTISSET($fieldname)) {
- return GETPOST($fieldname, 'alphanohtml', 3);
+ return GETPOST($fieldname, $type, 3);
}
if (isset($alternatevalue)) {
| |