diff options
author | Frédéric Guillot <fred@kanboard.net> | 2018-04-06 14:06:18 -0700 |
---|---|---|
committer | Frédéric Guillot <fred@kanboard.net> | 2018-04-06 14:06:18 -0700 |
commit | f6e2dea411246c011d3d1d21d56fda0cf8c3705f (patch) | |
tree | 553bea6d2c5a1fa9fbd9ab2b13d08199e07d0ad5 | |
parent | 0b306fa60ad84ea077111e0ff7b59208ba7bc8a3 (diff) |
Make sure no empty group is submitted on project permissions page
31 files changed, 37 insertions, 3 deletions
diff --git a/app/Controller/ProjectPermissionController.php b/app/Controller/ProjectPermissionController.php index 3fb6c090..1301285f 100644 --- a/app/Controller/ProjectPermissionController.php +++ b/app/Controller/ProjectPermissionController.php @@ -135,10 +135,14 @@ class ProjectPermissionController extends BaseController $values['group_id'] = $this->groupModel->getOrCreateExternalGroupId($values['name'], $values['external_id']); } - if ($this->projectGroupRoleModel->addGroup($project['id'], $values['group_id'], $values['role'])) { - $this->flash->success(t('Project updated successfully.')); + if (empty($values['group_id'])) { + $this->flash->failure(t('Unable to find this group.')); } else { - $this->flash->failure(t('Unable to update this project.')); + if ($this->projectGroupRoleModel->addGroup($project['id'], $values['group_id'], $values['role'])) { + $this->flash->success(t('Project updated successfully.')); + } else { + $this->flash->failure(t('Unable to update this project.')); + } } $this->response->redirect($this->helper->url->to('ProjectPermissionController', 'index', array('project_id' => $project['id']))); diff --git a/app/Locale/bs_BA/translations.php b/app/Locale/bs_BA/translations.php index 320d9e23..4094b8c5 100644 --- a/app/Locale/bs_BA/translations.php +++ b/app/Locale/bs_BA/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/ca_ES/translations.php b/app/Locale/ca_ES/translations.php index b31d1dcf..d2b5b753 100644 --- a/app/Locale/ca_ES/translations.php +++ b/app/Locale/ca_ES/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/cs_CZ/translations.php b/app/Locale/cs_CZ/translations.php index 7136db70..bc5e1a50 100644 --- a/app/Locale/cs_CZ/translations.php +++ b/app/Locale/cs_CZ/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php index e6e40464..7f4c1f0a 100644 --- a/app/Locale/da_DK/translations.php +++ b/app/Locale/da_DK/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php index 37ec50c6..e26f3387 100644 --- a/app/Locale/de_DE/translations.php +++ b/app/Locale/de_DE/translations.php @@ -1376,4 +1376,5 @@ return array( 'This task is now linked to the task %s with the relation "%s"' => 'Diese Aufgabe ist jetzt verknüpft mit der Aufgabe %s mit der Relation "%s"', 'The link with the relation "%s" to the task %s has been removed' => 'Die Verknüpfung mit der Relation "%s" zur Aufgabe %s wurde entfernt', 'Custom Filter:' => 'Benutzerdefinierter Filter:', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/el_GR/translations.php b/app/Locale/el_GR/translations.php index e3462131..f76e6bed 100644 --- a/app/Locale/el_GR/translations.php +++ b/app/Locale/el_GR/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php index e82eb194..debb40d7 100644 --- a/app/Locale/es_ES/translations.php +++ b/app/Locale/es_ES/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php index 557b9ec9..ab364a41 100644 --- a/app/Locale/fi_FI/translations.php +++ b/app/Locale/fi_FI/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php index 1026cd2b..f0b2e9f6 100644 --- a/app/Locale/fr_FR/translations.php +++ b/app/Locale/fr_FR/translations.php @@ -1376,4 +1376,5 @@ return array( 'This task is now linked to the task %s with the relation "%s"' => 'Cette tâche est maintenant liée à la tâche %s avec la relation « %s »', 'The link with the relation "%s" to the task %s has been removed' => 'Le lien avec la relation « %s » de la tâche %s a été supprimé', 'Custom Filter:' => 'Filtre personalisé :', + 'Unable to find this group.' => 'Impossible de trouver ce groupe.', ); diff --git a/app/Locale/hr_HR/translations.php b/app/Locale/hr_HR/translations.php index 0c5bacb9..0b6722bd 100644 --- a/app/Locale/hr_HR/translations.php +++ b/app/Locale/hr_HR/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php index 7d962364..b4a18019 100644 --- a/app/Locale/hu_HU/translations.php +++ b/app/Locale/hu_HU/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/id_ID/translations.php b/app/Locale/id_ID/translations.php index 9db9b843..f309f810 100644 --- a/app/Locale/id_ID/translations.php +++ b/app/Locale/id_ID/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php index 252e0f00..8866644a 100644 --- a/app/Locale/it_IT/translations.php +++ b/app/Locale/it_IT/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php index 50256675..441354fd 100644 --- a/app/Locale/ja_JP/translations.php +++ b/app/Locale/ja_JP/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/ko_KR/translations.php b/app/Locale/ko_KR/translations.php index ac7b4765..5b047ab0 100644 --- a/app/Locale/ko_KR/translations.php +++ b/app/Locale/ko_KR/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/my_MY/translations.php b/app/Locale/my_MY/translations.php index a0e179de..69362337 100644 --- a/app/Locale/my_MY/translations.php +++ b/app/Locale/my_MY/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/nb_NO/translations.php b/app/Locale/nb_NO/translations.php index 55ccd895..1bc62969 100644 --- a/app/Locale/nb_NO/translations.php +++ b/app/Locale/nb_NO/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php index 828cb7d3..27017f66 100644 --- a/app/Locale/nl_NL/translations.php +++ b/app/Locale/nl_NL/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php index 80ec1f3f..5eb64e8b 100644 --- a/app/Locale/pl_PL/translations.php +++ b/app/Locale/pl_PL/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php index 9f57551f..46b1990d 100644 --- a/app/Locale/pt_BR/translations.php +++ b/app/Locale/pt_BR/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/pt_PT/translations.php b/app/Locale/pt_PT/translations.php index 3c65e7b4..fc21c4c2 100644 --- a/app/Locale/pt_PT/translations.php +++ b/app/Locale/pt_PT/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/ro_RO/translations.php b/app/Locale/ro_RO/translations.php index aa45528d..d408ea2d 100644 --- a/app/Locale/ro_RO/translations.php +++ b/app/Locale/ro_RO/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php index d3af8249..9f7520b9 100644 --- a/app/Locale/ru_RU/translations.php +++ b/app/Locale/ru_RU/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php index 79291685..87ba32d5 100644 --- a/app/Locale/sr_Latn_RS/translations.php +++ b/app/Locale/sr_Latn_RS/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php index 4c1c264b..c1ee67d2 100644 --- a/app/Locale/sv_SE/translations.php +++ b/app/Locale/sv_SE/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php index 4f8600be..99eaef22 100644 --- a/app/Locale/th_TH/translations.php +++ b/app/Locale/th_TH/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php index 0e04c7ff..8da31a9e 100644 --- a/app/Locale/tr_TR/translations.php +++ b/app/Locale/tr_TR/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/vi_VN/translations.php b/app/Locale/vi_VN/translations.php index 0858a279..ffa9a494 100644 --- a/app/Locale/vi_VN/translations.php +++ b/app/Locale/vi_VN/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php index be47277e..03afb4d8 100644 --- a/app/Locale/zh_CN/translations.php +++ b/app/Locale/zh_CN/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); diff --git a/app/Locale/zh_TW/translations.php b/app/Locale/zh_TW/translations.php index 7cbb9391..e1d1a4a9 100644 --- a/app/Locale/zh_TW/translations.php +++ b/app/Locale/zh_TW/translations.php @@ -1376,4 +1376,5 @@ return array( // 'This task is now linked to the task %s with the relation "%s"' => '', // 'The link with the relation "%s" to the task %s has been removed' => '', // 'Custom Filter:' => '', + // 'Unable to find this group.' => '', ); |