Skip to content

Commit d68ea7c

Browse files
author
Philippe GODOT
committed
2.7.9 code release
This release fixe some issues and add new functionnalities : Add the previous deleted link on Tools Menu Fix some bad translation Fix ProcessTasks cron Task during execution Add possibility to force projectTask association after Ticket transfer action Add new parameter to use the new functionnality (force projectTask association)
1 parent 8ffa6df commit d68ea7c

File tree

10 files changed

+1064
-963
lines changed

10 files changed

+1064
-963
lines changed

front/config.form.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,22 @@ function getPostDataFromFields(array $post_fields) {
428428
echo '</span>';
429429
echo '</td>' . "\n";
430430
echo '</tr>' . "\n";
431+
432+
// force change ProjectTask with last active after entity Transfert
433+
$forceActiveProjectTaskAfterTranfer = PluginProjectbridgeConfig::getConfValueByName('forceActiveProjectTaskAfterTranfer', true);
434+
435+
if (isset($post_data['projectbridge_config_forceActiveProjectTaskAfterTranfer'])) {
436+
$isRequiredContractSelectorOnCreatingTicketForm = $post_data['projectbridge_config_forceActiveProjectTaskAfterTranfer'];
437+
PluginProjectbridgeConfig::updateConfValue('forceActiveProjectTaskAfterTranfer', $forceActiveProjectTaskAfterTranfer);
438+
}
439+
echo '<tr id="forceActiveProjectTaskAfterTranfer" >' . "\n";
440+
echo '<td>' . __('Force change ProjectTask with last active after entity Transfert', 'projectbridge') . '' . "\n";
441+
echo '</td>' . "\n";
442+
echo '<td>' . "\n";
443+
Dropdown::showYesNo('projectbridge_config_forceActiveProjectTaskAfterTranfer', $forceActiveProjectTaskAfterTranfer, []);
444+
echo '</span>';
445+
echo '</td>' . "\n";
446+
echo '</tr>' . "\n";
431447

432448

433449
// projectbridge_config_globalContractQuotaAlert

hook.php

Lines changed: 868 additions & 824 deletions
Large diffs are not rendered by default.

inc/config.class.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,14 @@ public static function getConfByName($name) {
9696
* @param type $name
9797
* @return type
9898
*/
99-
public static function getConfValueByName($name) {
100-
$value = false;
101-
$conf = self::getConfByName($name);
102-
if ($conf) {
99+
public static function getConfValueByName($name, $defaultValue = false) {
100+
$value = $defaultValue;
101+
$conf = self::getConfByName($name);
102+
if (!is_null($conf)) {
103103
$value = json_decode($conf['value']);
104104
}
105105

106-
return $value;
106+
return $value;
107107
}
108108

109109
/**

inc/contract.class.php

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -680,6 +680,27 @@ public static function getProjectTasksForProjectByStatus($project_id, $status, $
680680

681681
return $tasks;
682682
}
683+
684+
public function getLastActiveProjectTasksForProject($project_id) {
685+
686+
global $DB;
687+
688+
$state_closed_value = PluginProjectbridgeState::getProjectStateIdByStatus('closed');
689+
690+
$task = null;
691+
foreach ($DB->request(
692+
'glpi_projecttasks',
693+
[
694+
"projects_id" => $project_id,
695+
"projectstates_id" => ['!=', $state_closed_value],
696+
'ORDER' => ['plan_start_date DESC'],
697+
'LIMIT' => 1
698+
]
699+
) as $data) {
700+
$task = $data;
701+
}
702+
return $task;
703+
}
683704

684705
/**
685706
* get all active projecttask associate to one project

inc/task.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public static function cronProcessTasks($cron_task = null) {
194194
* @param boolean $fromCronTask
195195
* @return type
196196
*/
197-
public function closeTaskAndCreateExcessTicket($tasks, $fromCronTask = true) {
197+
public static function closeTaskAndCreateExcessTicket($tasks, $fromCronTask = true) {
198198
$newTicketIds = [];
199199
foreach ($tasks as $task_data) {
200200
$expired = false;

locales/fr_FR.mo

219 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)