Move logic of PR #2496 to GroupModel

This commit is contained in:
Frederic Guillot
2016-07-20 21:40:27 -04:00
parent 3042504f99
commit 7b100cc57b
3 changed files with 30 additions and 8 deletions

View File

@@ -147,13 +147,7 @@ class ProjectPermissionController extends BaseController
$values = $this->request->getValues();
if (empty($values['group_id']) && ! empty($values['external_id'])) {
$group = $this->groupModel->getByExternalId($values['external_id']);
if ($group) {
$values['group_id'] = $group['id'];
}
else {
$values['group_id'] = $this->groupModel->create($values['name'], $values['external_id']);
}
$values['group_id'] = $this->groupModel->getOrCreateExternalGroupId($values['name'], $values['external_id']);
}
if ($this->projectGroupRoleModel->addGroup($project['id'], $values['group_id'], $values['role'])) {