diff --git a/lib/scm/scm.class.php b/lib/scm/scm.class.php index 99bf05df51..fa25c2d929 100644 --- a/lib/scm/scm.class.php +++ b/lib/scm/scm.class.php @@ -110,13 +110,13 @@ class scm $newArr = explode(",", $entityIds); $allCommands[$entityType][$action] = array_keys(array_flip($currArr) + array_flip($newArr)); - if ($action === 'story') { + if ($entityType === 'story') { $stories = array_merge($stories, $newArr); } - if ($action === 'task') { + if ($entityType === 'task') { $tasks = array_merge($tasks, $newArr); } - if ($action === 'bug') { + if ($entityType === 'bug') { $bugs = array_merge($bugs, $newArr); } @@ -124,7 +124,7 @@ class scm } } - return array('stories' => join(',', $stories), 'tasks' => join(',', $tasks), 'bugs' => join(',', $bugs)); + return array('stories' => $stories, 'tasks' => $tasks, 'bugs' => $bugs); } /** diff --git a/module/git/control.php b/module/git/control.php index 5ff629c7c2..fa09002e7c 100644 --- a/module/git/control.php +++ b/module/git/control.php @@ -72,7 +72,7 @@ class git extends control $path = helper::safe64Decode($path); if(common::hasPriv('repo', 'view')) { - $repos = $this->loadModel('repo')->getAllRepos(); + $repos = $this->loadModel('repo')->listAll(); foreach($repos as $repo) { if($repo->SCM != 'Git') continue;