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

Merge pull request #17279 from aspangaro/14a38

Browse Source 
NEW: Add constant MAIN_BUGTRACK_URL to add possibility to redirect to other service
This commit is contained in:
Laurent Destailleur 2021-04-19 21:42:13 +02:00 committed by GitHub
commit ee9c823c33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 47 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/admin/ihm.php
View File

@ -211,11 +211,12 @@ if ($action == 'update') {
dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_DAYS", GETPOST("MAIN_DEFAULT_WORKING_DAYS", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_HOURS", GETPOST("MAIN_DEFAULT_WORKING_HOURS", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "MAIN_BUGTRACK_ENABLELINK", GETPOST("MAIN_BUGTRACK_ENABLELINK", 'alpha'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "MAIN_FIRSTNAME_NAME_POSITION", GETPOST("MAIN_FIRSTNAME_NAME_POSITION", 'aZ09'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "MAIN_MOTD", dol_htmlcleanlastbr(GETPOST("main_motd", 'restricthtml')), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "MAIN_HOME", dol_htmlcleanlastbr(GETPOST("main_home", 'restricthtml')), 'chaine', 0, '', $conf->entity);
//dolibarr_set_const($db, "MAIN_BUGTRACK_ENABLELINK", GETPOST('MAIN_BUGTRACK_ENABLELINK', 'aZ09'), 'chaine', 0, '', $conf->entity);
//dolibarr_set_const($db, "MAIN_HELP_DISABLELINK", GETPOST("MAIN_HELP_DISABLELINK", 'aZ09'), 'chaine', 0, '', 0); // Param for all entities
$varforimage = 'imagebackground'; $dirforimage = $conf->mycompany->dir_output.'/logos/';
@ -401,8 +402,7 @@ print '</tr>';
// Show bugtrack link
print '<tr class="oddeven"><td>'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
print ajax_constantonoff("MAIN_BUGTRACK_ENABLELINK", array(), $conf->entity, 0, 0, 1, 0);
//print $form->selectyesno('MAIN_BUGTRACK_ENABLELINK', $conf->global->MAIN_BUGTRACK_ENABLELINK, 1);
print '<input type="text" name="MAIN_BUGTRACK_ENABLELINK" size="32" value="'.(isset($conf->global->MAIN_BUGTRACK_ENABLELINK) ? $conf->global->MAIN_BUGTRACK_ENABLELINK : '').'">';
print '</td>';
print '<td width="20">&nbsp;</td>';
print '</tr>';

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

@ -425,4 +425,6 @@ ALTER TABLE llx_facture_fourn ADD COLUMN date_closing datetime DEFAULT NULL afte
ALTER TABLE llx_facture_fourn ADD COLUMN fk_user_closing integer DEFAULT NULL after fk_user_valid;
ALTER TABLE llx_entrepot ADD COLUMN fk_project INTEGER DEFAULT NULL AFTER entity; -- project associated to warehouse if any
ALTER TABLE llx_entrepot ADD COLUMN fk_project INTEGER DEFAULT NULL AFTER entity; -- project associated to warehouse if any
UPDATE llx_const SET value = 'github' WHERE __DECRYPT('name')__ = 'MAIN_BUGTRACK_ENABLELINK' AND __DECRYPT('value')__ = 1;

2
htdocs/langs/en_US/admin.lang
View File

@ -1159,7 +1159,7 @@ DoNotSuggestPaymentMode=Do not suggest
NoActiveBankAccountDefined=No active bank account defined
OwnerOfBankAccount=Owner of bank account %s
BankModuleNotActive=Bank accounts module not enabled
ShowBugTrackLink=Show link "<strong>%s</strong>"
ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
Alerts=Alerts
DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.

74
htdocs/main.inc.php
View File

@ -2743,41 +2743,49 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
if (!empty($conf->global->MAIN_BUGTRACK_ENABLELINK)) {
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new?labels=Bug';
$bugbaseurl .= '&title=';
$bugbaseurl .= urlencode("Bug: ");
$bugbaseurl .= '&body=';
$bugbaseurl .= urlencode("# Instructions\n");
$bugbaseurl .= urlencode("*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*\n");
$bugbaseurl .= urlencode("*Please:*\n");
$bugbaseurl .= urlencode("- *replace the bracket enclosed texts with meaningful information*\n");
$bugbaseurl .= urlencode("- *remove any unused sub-section*\n");
$bugbaseurl .= urlencode("\n");
$bugbaseurl .= urlencode("\n");
$bugbaseurl .= urlencode("# Bug\n");
$bugbaseurl .= urlencode("[*Short description*]\n");
$bugbaseurl .= urlencode("\n");
$bugbaseurl .= urlencode("## Environment\n");
$bugbaseurl .= urlencode("- **Version**: ".DOL_VERSION."\n");
$bugbaseurl .= urlencode("- **OS**: ".php_uname('s')."\n");
$bugbaseurl .= urlencode("- **Web server**: ".$_SERVER["SERVER_SOFTWARE"]."\n");
$bugbaseurl .= urlencode("- **PHP**: ".php_sapi_name().' '.phpversion()."\n");
$bugbaseurl .= urlencode("- **Database**: ".$db::LABEL.' '.$db->getVersion()."\n");
$bugbaseurl .= urlencode("- **URL(s)**: ".$_SERVER["REQUEST_URI"]."\n");
$bugbaseurl .= urlencode("\n");
$bugbaseurl .= urlencode("## Expected and actual behavior\n");
$bugbaseurl .= urlencode("[*Verbose description*]\n");
$bugbaseurl .= urlencode("\n");
$bugbaseurl .= urlencode("## Steps to reproduce the behavior\n");
$bugbaseurl .= urlencode("[*Verbose description*]\n");
$bugbaseurl .= urlencode("\n");
$bugbaseurl .= urlencode("## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)\n");
$bugbaseurl .= urlencode("[*Files*]\n");
$bugbaseurl .= urlencode("\n");
if ($conf->global->MAIN_BUGTRACK_ENABLELINK == 'github') {
$bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new?labels=Bug';
$bugbaseurl .= '&title=';
$bugbaseurl .= urlencode("Bug: ");
$bugbaseurl .= '&body=';
$bugbaseurl .= urlencode("# Instructions\n");
$bugbaseurl .= urlencode("*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*\n");
$bugbaseurl .= urlencode("*Please:*\n");
$bugbaseurl .= urlencode("- *replace the bracket enclosed texts with meaningful information*\n");
$bugbaseurl .= urlencode("- *remove any unused sub-section*\n");
$bugbaseurl .= urlencode("\n");
$bugbaseurl .= urlencode("\n");
$bugbaseurl .= urlencode("# Bug\n");
$bugbaseurl .= urlencode("[*Short description*]\n");
$bugbaseurl .= urlencode("\n");
$bugbaseurl .= urlencode("## Environment\n");
$bugbaseurl .= urlencode("- **Version**: " . DOL_VERSION . "\n");
$bugbaseurl .= urlencode("- **OS**: " . php_uname('s') . "\n");
$bugbaseurl .= urlencode("- **Web server**: " . $_SERVER["SERVER_SOFTWARE"] . "\n");
$bugbaseurl .= urlencode("- **PHP**: " . php_sapi_name() . ' ' . phpversion() . "\n");
$bugbaseurl .= urlencode("- **Database**: " . $db::LABEL . ' ' . $db->getVersion() . "\n");
$bugbaseurl .= urlencode("- **URL(s)**: " . $_SERVER["REQUEST_URI"] . "\n");
$bugbaseurl .= urlencode("\n");
$bugbaseurl .= urlencode("## Expected and actual behavior\n");
$bugbaseurl .= urlencode("[*Verbose description*]\n");
$bugbaseurl .= urlencode("\n");
$bugbaseurl .= urlencode("## Steps to reproduce the behavior\n");
$bugbaseurl .= urlencode("[*Verbose description*]\n");
$bugbaseurl .= urlencode("\n");
$bugbaseurl .= urlencode("## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)\n");
$bugbaseurl .= urlencode("[*Files*]\n");
$bugbaseurl .= urlencode("\n");
$bugbaseurl .= urlencode("\n");
$bugbaseurl .= urlencode("## Report\n");
} elseif (!empty($conf->global->MAIN_BUGTRACK_ENABLELINK)) {
$bugbaseurl = $conf->global->MAIN_BUGTRACK_ENABLELINK;
} else {
$bugbaseurl = "";
}
// Execute hook printBugtrackInfo
$parameters = array('bugbaseurl'=>$bugbaseurl);
$parameters = array('bugbaseurl' => $bugbaseurl);
$reshook = $hookmanager->executeHooks('printBugtrackInfo', $parameters); // Note that $action and $object may have been modified by some hooks
if (empty($reshook)) {
$bugbaseurl .= $hookmanager->resPrint;
@ -2785,8 +2793,6 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
$bugbaseurl = $hookmanager->resPrint;
}
$bugbaseurl .= urlencode("\n");
$bugbaseurl .= urlencode("## Report\n");
print '<div id="blockvmenuhelpbugreport" class="blockvmenuhelp">';
print '<a class="help" target="_blank" rel="noopener" href="'.$bugbaseurl.'">'.$langs->trans("FindBug").'</a>';
print '</div>';