Improve and translate pull-request
This commit is contained in:
@@ -34,8 +34,8 @@ class TaskMoveColumnAssigned extends Base
|
|||||||
public function getActionRequiredParameters()
|
public function getActionRequiredParameters()
|
||||||
{
|
{
|
||||||
return array(
|
return array(
|
||||||
'src_column_id' => t('From column'),
|
'src_column_id' => t('Source column'),
|
||||||
'dest_column_id' => t('To column')
|
'dest_column_id' => t('Destination column')
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -85,7 +85,6 @@ class TaskMoveColumnAssigned extends Base
|
|||||||
*/
|
*/
|
||||||
public function hasRequiredCondition(array $data)
|
public function hasRequiredCondition(array $data)
|
||||||
{
|
{
|
||||||
return $data['column_id'] == $this->getParam('src_column_id') &&
|
return $data['column_id'] == $this->getParam('src_column_id') && $data['owner_id'];
|
||||||
$data['owner_id'];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,8 +34,8 @@ class TaskMoveColumnUnAssigned extends Base
|
|||||||
public function getActionRequiredParameters()
|
public function getActionRequiredParameters()
|
||||||
{
|
{
|
||||||
return array(
|
return array(
|
||||||
'src_column_id' => t('From column'),
|
'src_column_id' => t('Source column'),
|
||||||
'dest_column_id' => t('To column')
|
'dest_column_id' => t('Destination column')
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -85,7 +85,6 @@ class TaskMoveColumnUnAssigned extends Base
|
|||||||
*/
|
*/
|
||||||
public function hasRequiredCondition(array $data)
|
public function hasRequiredCondition(array $data)
|
||||||
{
|
{
|
||||||
return $data['column_id'] == $this->getParam('src_column_id') &&
|
return $data['column_id'] == $this->getParam('src_column_id') && ! $data['owner_id'];
|
||||||
!$data['owner_id'];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -804,4 +804,8 @@ return array(
|
|||||||
// 'Unable to remove this budget line.' => '',
|
// 'Unable to remove this budget line.' => '',
|
||||||
// 'USD - US Dollar' => '',
|
// 'USD - US Dollar' => '',
|
||||||
// 'Remaining' => '',
|
// 'Remaining' => '',
|
||||||
|
// 'Destination column' => '',
|
||||||
|
// 'Move the task to another column when assigned to a user' => '',
|
||||||
|
// 'Move the task to another column when assignee is cleared' => '',
|
||||||
|
// 'Source column' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -804,4 +804,8 @@ return array(
|
|||||||
// 'Unable to remove this budget line.' => '',
|
// 'Unable to remove this budget line.' => '',
|
||||||
// 'USD - US Dollar' => '',
|
// 'USD - US Dollar' => '',
|
||||||
// 'Remaining' => '',
|
// 'Remaining' => '',
|
||||||
|
// 'Destination column' => '',
|
||||||
|
// 'Move the task to another column when assigned to a user' => '',
|
||||||
|
// 'Move the task to another column when assignee is cleared' => '',
|
||||||
|
// 'Source column' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -804,4 +804,8 @@ return array(
|
|||||||
// 'Unable to remove this budget line.' => '',
|
// 'Unable to remove this budget line.' => '',
|
||||||
// 'USD - US Dollar' => '',
|
// 'USD - US Dollar' => '',
|
||||||
// 'Remaining' => '',
|
// 'Remaining' => '',
|
||||||
|
// 'Destination column' => '',
|
||||||
|
// 'Move the task to another column when assigned to a user' => '',
|
||||||
|
// 'Move the task to another column when assignee is cleared' => '',
|
||||||
|
// 'Source column' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -804,4 +804,8 @@ return array(
|
|||||||
// 'Unable to remove this budget line.' => '',
|
// 'Unable to remove this budget line.' => '',
|
||||||
// 'USD - US Dollar' => '',
|
// 'USD - US Dollar' => '',
|
||||||
// 'Remaining' => '',
|
// 'Remaining' => '',
|
||||||
|
// 'Destination column' => '',
|
||||||
|
// 'Move the task to another column when assigned to a user' => '',
|
||||||
|
// 'Move the task to another column when assignee is cleared' => '',
|
||||||
|
// 'Source column' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -806,4 +806,8 @@ return array(
|
|||||||
'Unable to remove this budget line.' => 'Impossible de supprimer cette ligne budgétaire.',
|
'Unable to remove this budget line.' => 'Impossible de supprimer cette ligne budgétaire.',
|
||||||
'USD - US Dollar' => 'USD - Dollar américain',
|
'USD - US Dollar' => 'USD - Dollar américain',
|
||||||
'Remaining' => 'Restant',
|
'Remaining' => 'Restant',
|
||||||
|
'Destination column' => 'Colonne de destination',
|
||||||
|
'Move the task to another column when assigned to a user' => 'Déplacer la tâche dans une autre colonne lorsque celle-ci est assignée à quelqu\'un',
|
||||||
|
'Move the task to another column when assignee is cleared' => 'Déplacer la tâche dans une autre colonne lorsque celle-ci n\'est plus assignée',
|
||||||
|
'Source column' => 'Colonne d\'origine',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -804,4 +804,8 @@ return array(
|
|||||||
// 'Unable to remove this budget line.' => '',
|
// 'Unable to remove this budget line.' => '',
|
||||||
// 'USD - US Dollar' => '',
|
// 'USD - US Dollar' => '',
|
||||||
// 'Remaining' => '',
|
// 'Remaining' => '',
|
||||||
|
// 'Destination column' => '',
|
||||||
|
// 'Move the task to another column when assigned to a user' => '',
|
||||||
|
// 'Move the task to another column when assignee is cleared' => '',
|
||||||
|
// 'Source column' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -804,4 +804,8 @@ return array(
|
|||||||
// 'Unable to remove this budget line.' => '',
|
// 'Unable to remove this budget line.' => '',
|
||||||
// 'USD - US Dollar' => '',
|
// 'USD - US Dollar' => '',
|
||||||
// 'Remaining' => '',
|
// 'Remaining' => '',
|
||||||
|
// 'Destination column' => '',
|
||||||
|
// 'Move the task to another column when assigned to a user' => '',
|
||||||
|
// 'Move the task to another column when assignee is cleared' => '',
|
||||||
|
// 'Source column' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -804,4 +804,8 @@ return array(
|
|||||||
// 'Unable to remove this budget line.' => '',
|
// 'Unable to remove this budget line.' => '',
|
||||||
// 'USD - US Dollar' => '',
|
// 'USD - US Dollar' => '',
|
||||||
// 'Remaining' => '',
|
// 'Remaining' => '',
|
||||||
|
// 'Destination column' => '',
|
||||||
|
// 'Move the task to another column when assigned to a user' => '',
|
||||||
|
// 'Move the task to another column when assignee is cleared' => '',
|
||||||
|
// 'Source column' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -804,4 +804,8 @@ return array(
|
|||||||
// 'Unable to remove this budget line.' => '',
|
// 'Unable to remove this budget line.' => '',
|
||||||
// 'USD - US Dollar' => '',
|
// 'USD - US Dollar' => '',
|
||||||
// 'Remaining' => '',
|
// 'Remaining' => '',
|
||||||
|
// 'Destination column' => '',
|
||||||
|
// 'Move the task to another column when assigned to a user' => '',
|
||||||
|
// 'Move the task to another column when assignee is cleared' => '',
|
||||||
|
// 'Source column' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -804,4 +804,8 @@ return array(
|
|||||||
// 'Unable to remove this budget line.' => '',
|
// 'Unable to remove this budget line.' => '',
|
||||||
// 'USD - US Dollar' => '',
|
// 'USD - US Dollar' => '',
|
||||||
// 'Remaining' => '',
|
// 'Remaining' => '',
|
||||||
|
// 'Destination column' => '',
|
||||||
|
// 'Move the task to another column when assigned to a user' => '',
|
||||||
|
// 'Move the task to another column when assignee is cleared' => '',
|
||||||
|
// 'Source column' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -804,4 +804,8 @@ return array(
|
|||||||
// 'Unable to remove this budget line.' => '',
|
// 'Unable to remove this budget line.' => '',
|
||||||
// 'USD - US Dollar' => '',
|
// 'USD - US Dollar' => '',
|
||||||
// 'Remaining' => '',
|
// 'Remaining' => '',
|
||||||
|
// 'Destination column' => '',
|
||||||
|
// 'Move the task to another column when assigned to a user' => '',
|
||||||
|
// 'Move the task to another column when assignee is cleared' => '',
|
||||||
|
// 'Source column' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -804,4 +804,8 @@ return array(
|
|||||||
// 'Unable to remove this budget line.' => '',
|
// 'Unable to remove this budget line.' => '',
|
||||||
// 'USD - US Dollar' => '',
|
// 'USD - US Dollar' => '',
|
||||||
// 'Remaining' => '',
|
// 'Remaining' => '',
|
||||||
|
// 'Destination column' => '',
|
||||||
|
// 'Move the task to another column when assigned to a user' => '',
|
||||||
|
// 'Move the task to another column when assignee is cleared' => '',
|
||||||
|
// 'Source column' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -804,4 +804,8 @@ return array(
|
|||||||
// 'Unable to remove this budget line.' => '',
|
// 'Unable to remove this budget line.' => '',
|
||||||
// 'USD - US Dollar' => '',
|
// 'USD - US Dollar' => '',
|
||||||
// 'Remaining' => '',
|
// 'Remaining' => '',
|
||||||
|
// 'Destination column' => '',
|
||||||
|
// 'Move the task to another column when assigned to a user' => '',
|
||||||
|
// 'Move the task to another column when assignee is cleared' => '',
|
||||||
|
// 'Source column' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -804,4 +804,8 @@ return array(
|
|||||||
// 'Unable to remove this budget line.' => '',
|
// 'Unable to remove this budget line.' => '',
|
||||||
// 'USD - US Dollar' => '',
|
// 'USD - US Dollar' => '',
|
||||||
// 'Remaining' => '',
|
// 'Remaining' => '',
|
||||||
|
// 'Destination column' => '',
|
||||||
|
// 'Move the task to another column when assigned to a user' => '',
|
||||||
|
// 'Move the task to another column when assignee is cleared' => '',
|
||||||
|
// 'Source column' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -804,4 +804,8 @@ return array(
|
|||||||
// 'Unable to remove this budget line.' => '',
|
// 'Unable to remove this budget line.' => '',
|
||||||
// 'USD - US Dollar' => '',
|
// 'USD - US Dollar' => '',
|
||||||
// 'Remaining' => '',
|
// 'Remaining' => '',
|
||||||
|
// 'Destination column' => '',
|
||||||
|
// 'Move the task to another column when assigned to a user' => '',
|
||||||
|
// 'Move the task to another column when assignee is cleared' => '',
|
||||||
|
// 'Source column' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -804,4 +804,8 @@ return array(
|
|||||||
// 'Unable to remove this budget line.' => '',
|
// 'Unable to remove this budget line.' => '',
|
||||||
// 'USD - US Dollar' => '',
|
// 'USD - US Dollar' => '',
|
||||||
// 'Remaining' => '',
|
// 'Remaining' => '',
|
||||||
|
// 'Destination column' => '',
|
||||||
|
// 'Move the task to another column when assigned to a user' => '',
|
||||||
|
// 'Move the task to another column when assignee is cleared' => '',
|
||||||
|
// 'Source column' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -804,4 +804,8 @@ return array(
|
|||||||
// 'Unable to remove this budget line.' => '',
|
// 'Unable to remove this budget line.' => '',
|
||||||
// 'USD - US Dollar' => '',
|
// 'USD - US Dollar' => '',
|
||||||
// 'Remaining' => '',
|
// 'Remaining' => '',
|
||||||
|
// 'Destination column' => '',
|
||||||
|
// 'Move the task to another column when assigned to a user' => '',
|
||||||
|
// 'Move the task to another column when assignee is cleared' => '',
|
||||||
|
// 'Source column' => '',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ class TaskPosition extends Base
|
|||||||
* @param integer $column_id Column id
|
* @param integer $column_id Column id
|
||||||
* @param integer $position Position (must be >= 1)
|
* @param integer $position Position (must be >= 1)
|
||||||
* @param integer $swimlane_id Swimlane id
|
* @param integer $swimlane_id Swimlane id
|
||||||
|
* @param boolean $fire_events Fire events
|
||||||
* @return boolean
|
* @return boolean
|
||||||
*/
|
*/
|
||||||
public function movePosition($project_id, $task_id, $column_id, $position, $swimlane_id = 0, $fire_events = true)
|
public function movePosition($project_id, $task_id, $column_id, $position, $swimlane_id = 0, $fire_events = true)
|
||||||
@@ -30,13 +31,14 @@ class TaskPosition extends Base
|
|||||||
$result = $this->calculateAndSave($project_id, $task_id, $column_id, $position, $swimlane_id);
|
$result = $this->calculateAndSave($project_id, $task_id, $column_id, $position, $swimlane_id);
|
||||||
|
|
||||||
if ($result) {
|
if ($result) {
|
||||||
|
|
||||||
if ($original_task['swimlane_id'] != $swimlane_id) {
|
if ($original_task['swimlane_id'] != $swimlane_id) {
|
||||||
$this->calculateAndSave($project_id, 0, $column_id, 1, $original_task['swimlane_id']);
|
$this->calculateAndSave($project_id, 0, $column_id, 1, $original_task['swimlane_id']);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($fire_events)
|
if ($fire_events) {
|
||||||
$this->fireEvents($original_task, $column_id, $position, $swimlane_id);
|
$this->fireEvents($original_task, $column_id, $position, $swimlane_id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $result;
|
return $result;
|
||||||
|
|||||||
Reference in New Issue
Block a user