summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/Action/TaskMoveColumnAssigned.php7
-rw-r--r--app/Action/TaskMoveColumnUnAssigned.php7
-rw-r--r--app/Locale/da_DK/translations.php4
-rw-r--r--app/Locale/de_DE/translations.php4
-rw-r--r--app/Locale/es_ES/translations.php4
-rw-r--r--app/Locale/fi_FI/translations.php4
-rw-r--r--app/Locale/fr_FR/translations.php4
-rw-r--r--app/Locale/hu_HU/translations.php4
-rw-r--r--app/Locale/it_IT/translations.php4
-rw-r--r--app/Locale/ja_JP/translations.php4
-rw-r--r--app/Locale/nl_NL/translations.php4
-rw-r--r--app/Locale/pl_PL/translations.php4
-rw-r--r--app/Locale/pt_BR/translations.php4
-rw-r--r--app/Locale/ru_RU/translations.php4
-rw-r--r--app/Locale/sr_Latn_RS/translations.php4
-rw-r--r--app/Locale/sv_SE/translations.php4
-rw-r--r--app/Locale/th_TH/translations.php4
-rw-r--r--app/Locale/tr_TR/translations.php4
-rw-r--r--app/Locale/zh_CN/translations.php4
-rw-r--r--app/Model/TaskPosition.php6
20 files changed, 78 insertions, 10 deletions
diff --git a/app/Action/TaskMoveColumnAssigned.php b/app/Action/TaskMoveColumnAssigned.php
index 0f47ee19..decf4b01 100644
--- a/app/Action/TaskMoveColumnAssigned.php
+++ b/app/Action/TaskMoveColumnAssigned.php
@@ -34,8 +34,8 @@ class TaskMoveColumnAssigned extends Base
public function getActionRequiredParameters()
{
return array(
- 'src_column_id' => t('From column'),
- 'dest_column_id' => t('To column')
+ 'src_column_id' => t('Source column'),
+ 'dest_column_id' => t('Destination column')
);
}
@@ -85,7 +85,6 @@ class TaskMoveColumnAssigned extends Base
*/
public function hasRequiredCondition(array $data)
{
- return $data['column_id'] == $this->getParam('src_column_id') &&
- $data['owner_id'];
+ return $data['column_id'] == $this->getParam('src_column_id') && $data['owner_id'];
}
}
diff --git a/app/Action/TaskMoveColumnUnAssigned.php b/app/Action/TaskMoveColumnUnAssigned.php
index 66159b0c..b773252d 100644
--- a/app/Action/TaskMoveColumnUnAssigned.php
+++ b/app/Action/TaskMoveColumnUnAssigned.php
@@ -34,8 +34,8 @@ class TaskMoveColumnUnAssigned extends Base
public function getActionRequiredParameters()
{
return array(
- 'src_column_id' => t('From column'),
- 'dest_column_id' => t('To column')
+ 'src_column_id' => t('Source column'),
+ 'dest_column_id' => t('Destination column')
);
}
@@ -85,7 +85,6 @@ class TaskMoveColumnUnAssigned extends Base
*/
public function hasRequiredCondition(array $data)
{
- return $data['column_id'] == $this->getParam('src_column_id') &&
- !$data['owner_id'];
+ return $data['column_id'] == $this->getParam('src_column_id') && ! $data['owner_id'];
}
}
diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php
index 1732e7bb..c12e6d9b 100644
--- a/app/Locale/da_DK/translations.php
+++ b/app/Locale/da_DK/translations.php
@@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// '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' => '',
);
diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php
index 3ab31d97..3a3d145e 100644
--- a/app/Locale/de_DE/translations.php
+++ b/app/Locale/de_DE/translations.php
@@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// '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' => '',
);
diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php
index f186dfc8..00b342dd 100644
--- a/app/Locale/es_ES/translations.php
+++ b/app/Locale/es_ES/translations.php
@@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// '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' => '',
);
diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php
index f235cc12..d1ae2412 100644
--- a/app/Locale/fi_FI/translations.php
+++ b/app/Locale/fi_FI/translations.php
@@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// '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' => '',
);
diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php
index 1aadb393..340d16b1 100644
--- a/app/Locale/fr_FR/translations.php
+++ b/app/Locale/fr_FR/translations.php
@@ -806,4 +806,8 @@ return array(
'Unable to remove this budget line.' => 'Impossible de supprimer cette ligne budgétaire.',
'USD - US Dollar' => 'USD - Dollar américain',
'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',
);
diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php
index 75cdbebc..a8d5b637 100644
--- a/app/Locale/hu_HU/translations.php
+++ b/app/Locale/hu_HU/translations.php
@@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// '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' => '',
);
diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php
index d5fd6902..6e704ca1 100644
--- a/app/Locale/it_IT/translations.php
+++ b/app/Locale/it_IT/translations.php
@@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// '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' => '',
);
diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php
index 6e3c14c8..43834145 100644
--- a/app/Locale/ja_JP/translations.php
+++ b/app/Locale/ja_JP/translations.php
@@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// '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' => '',
);
diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php
index 2b434d53..00ef6023 100644
--- a/app/Locale/nl_NL/translations.php
+++ b/app/Locale/nl_NL/translations.php
@@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// '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' => '',
);
diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php
index 4bee7c42..2f5be941 100644
--- a/app/Locale/pl_PL/translations.php
+++ b/app/Locale/pl_PL/translations.php
@@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// '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' => '',
);
diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php
index edba2cae..6edf5d0d 100644
--- a/app/Locale/pt_BR/translations.php
+++ b/app/Locale/pt_BR/translations.php
@@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// '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' => '',
);
diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php
index 6a2ed073..8f597adc 100644
--- a/app/Locale/ru_RU/translations.php
+++ b/app/Locale/ru_RU/translations.php
@@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// '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' => '',
);
diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php
index 83d6eaa3..9c7f63a8 100644
--- a/app/Locale/sr_Latn_RS/translations.php
+++ b/app/Locale/sr_Latn_RS/translations.php
@@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// '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' => '',
);
diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php
index 5b3b31c3..212440a7 100644
--- a/app/Locale/sv_SE/translations.php
+++ b/app/Locale/sv_SE/translations.php
@@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// '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' => '',
);
diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php
index 4b41e625..bc94adf4 100644
--- a/app/Locale/th_TH/translations.php
+++ b/app/Locale/th_TH/translations.php
@@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// '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' => '',
);
diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php
index 488526f0..0272a7f8 100644
--- a/app/Locale/tr_TR/translations.php
+++ b/app/Locale/tr_TR/translations.php
@@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// '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' => '',
);
diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php
index 31d63632..e99fedab 100644
--- a/app/Locale/zh_CN/translations.php
+++ b/app/Locale/zh_CN/translations.php
@@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// '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' => '',
);
diff --git a/app/Model/TaskPosition.php b/app/Model/TaskPosition.php
index c2b5cb86..6dd10b02 100644
--- a/app/Model/TaskPosition.php
+++ b/app/Model/TaskPosition.php
@@ -21,6 +21,7 @@ class TaskPosition extends Base
* @param integer $column_id Column id
* @param integer $position Position (must be >= 1)
* @param integer $swimlane_id Swimlane id
+ * @param boolean $fire_events Fire events
* @return boolean
*/
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);
if ($result) {
-
+
if ($original_task['swimlane_id'] != $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);
+ }
}
return $result;
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-23 12:21:24 +0000