lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to match eldy changes

Browse Source
This commit is contained in:
lmarcouiller 2021-07-16 15:47:17 +02:00
parent 2fd520cadc
commit 1fb99a3185
5 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/install/mysql/migration/13.0.0-14.0.0.sql
View File

@ -596,4 +596,4 @@ create table llx_onlinesignature
pathoffile varchar(255)
)ENGINE=innodb;
ALTER TABLE llx_knowledgemanagement_knowledgerecord ADD default_lang varchar(6)
ALTER TABLE llx_knowledgemanagement_knowledgerecord ADD lang varchar(6);

2
htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.sql
View File

@ -21,7 +21,7 @@ CREATE TABLE llx_knowledgemanagement_knowledgerecord(
date_creation datetime NOT NULL,
tms timestamp,
last_main_doc varchar(255),
default_lang varchar(6),
lang varchar(6),
fk_user_creat integer NOT NULL,
fk_user_modif integer,
fk_user_valid integer,

4
htdocs/knowledgemanagement/class/knowledgerecord.class.php
View File

@ -115,7 +115,7 @@ class KnowledgeRecord extends CommonObject
//'url' => array('type'=>'varchar(255)', 'label'=>'URL', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>-1, 'csslist'=>'tdoverflow200', 'help'=>'UrlForInfoPage'),
'fk_c_ticket_category' => array('type'=>'integer:CTicketCategory:ticket/class/cticketcategory.class.php', 'label'=>'GroupOfTicket', 'enabled'=>'$conf->ticket->enabled', 'position'=>512, 'notnull'=>0, 'visible'=>-1, 'help'=>'YouCanLinkArticleToATicketCategory'),
'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>1, 'default'=>0, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Valid'),),
'default_lang' => array('type'=>'varchar(6)', 'label'=>'Language', 'enabled'=>'1', 'position'=>51, 'notnull'=>0, 'visible'=>0,),
'lang' => array('type'=>'varchar(6)', 'label'=>'Language', 'enabled'=>'1', 'position'=>51, 'notnull'=>0, 'visible'=>0,),
);
public $rowid;
public $ref;
@ -131,7 +131,7 @@ class KnowledgeRecord extends CommonObject
public $answer;
public $url;
public $status;
public $default_lang;
public $lang;
// END MODULEBUILDER PROPERTIES

13
htdocs/knowledgemanagement/knowledgerecord_card.php
View File

@ -118,6 +118,11 @@ if (empty($reshook)) {
$triggermodname = 'KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_MODIFY'; // Name of trigger action code to execute when we modify record
// Upadate / add for lang
if (($action == 'update' || $action == 'add') && !empty($permissiontoadd)) {
$object->lang = GETPOSTISSET('langkm', 'aZ09')?GETPOST('langkm', 'aZ09'):$object->lang;
}
// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
@ -190,7 +195,7 @@ if ($action == 'create') {
//Language of question/response
print '<tr class="oddeven"><td>'.$langs->trans("Language").'</td><td>';
print img_picto('', 'language', 'class="pictofixedwidth"');
print $formadmin->select_language('', 'default_lang', 0, null, 1, 0, 0, 'minwidth300', 2);
print $formadmin->select_language('', 'langkm', 0, null, 1, 0, 0, 'minwidth300', 2);
print '</td>';
print '</tr>';
@ -237,7 +242,7 @@ if (($id || $ref) && $action == 'edit') {
//Language of question/response
print '<tr class="oddeven"><td>'.$langs->trans("Language").'</td><td>';
print img_picto('', 'language', 'class="pictofixedwidth"');
print $formadmin->select_language($object->default_lang, 'default_lang', 0, null, 1, 0, 0, 'minwidth300', 2);
print $formadmin->select_language($object->lang, 'langkm', 0, null, 1, 0, 0, 'minwidth300', 2);
print '</td>';
print '</tr>';
@ -351,8 +356,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
//Language of question/response
print '<tr class="oddeven"><td>'.$langs->trans("Language").'</td><td>';
$langs->load("languages");
$labellang = ($object->default_lang ? $langs->trans('Language_'.$object->default_lang) : '');
print picto_from_langcode($object->default_lang, 'class="paddingrightonly saturatemedium opacitylow"');
$labellang = ($object->lang ? $langs->trans('Language_'.$object->lang) : '');
print picto_from_langcode($object->lang, 'class="paddingrightonly saturatemedium opacitylow"');
print $labellang;
print '</td>';
print '</tr>';

12
htdocs/knowledgemanagement/knowledgerecord_list.php
View File

@ -118,7 +118,7 @@ foreach ($object->fields as $key => $val) {
'position'=>$val['position'],
'help'=> isset($val['help']) ? $val['help'] : ''
);
} elseif ($key = 'default_lang') {
} elseif ($key = 'lang') {
$visible = (int) dol_eval($val['visible'], 1);
$arrayfields['t.'.$key] = array(
'label'=>$val['label'],
@ -466,8 +466,8 @@ foreach ($object->fields as $key => $val) {
} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:')=== 0)) {
print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
if ($key == 'default_lang') {
print $formadmin->select_language($search[$key], 'search_default_lang', 0, null, 1, 0, 0, 'minwidth300', 2);
if ($key == 'lang') {
print $formadmin->select_language($search[$key], 'search_lang', 0, null, 1, 0, 0, 'minwidth300', 2);
} else {
print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
}
@ -607,9 +607,9 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
}
print $user_temp->getNomUrl(-1);
}
} elseif ($key == 'default_lang') {
$labellang = ($object->default_lang ? $langs->trans('Language_'.$object->default_lang) : '');
print picto_from_langcode($object->default_lang, 'class="paddingrightonly saturatemedium opacitylow"');
} elseif ($key == 'lang') {
$labellang = ($object->lang ? $langs->trans('Language_'.$object->lang) : '');
print picto_from_langcode($object->lang, 'class="paddingrightonly saturatemedium opacitylow"');
print $labellang;
} else {
print $object->showOutputField($val, $key, $object->$key, '');