diff --git a/module/artifactrepo/model.php b/module/artifactrepo/model.php index 86ff9c10a8..79041a5b5e 100644 --- a/module/artifactrepo/model.php +++ b/module/artifactrepo/model.php @@ -76,7 +76,7 @@ class artifactrepoModel extends model $response = common::http($url, '', array(CURLOPT_USERPWD => $auth)); $data = json_decode($response); - return $data; + return is_array($data) ? $data : array(); } return array(); diff --git a/module/repo/control.php b/module/repo/control.php index 3a8925b828..0c7cceddfe 100644 --- a/module/repo/control.php +++ b/module/repo/control.php @@ -1052,7 +1052,7 @@ class repo extends control $this->view->repoID = $repoID; $this->view->objectID = $objectID; $this->view->branch = $branch; - $this->view->browseLink = $this->repo->createLink('browse', "repoID=" . ($this->app->tab == 'devops' ? $repoID : '') . "&branchID=" . helper::safe64Encode(base64_encode($branch)) . "&objectID=$objectID", '', false); + $this->view->browseLink = $this->repo->createLink('browse', "repoID=" . ($this->app->tab == 'devops' ? $repoID : '') . "&branchID=" . helper::safe64Encode(base64_encode($branch)) . "&objectID=$objectID", '', false) . "#app={$this->app->tab}"; $this->display(); } diff --git a/module/repo/ui/create.html.php b/module/repo/ui/create.html.php index 20d06a9aa2..8c8b29f924 100644 --- a/module/repo/ui/create.html.php +++ b/module/repo/ui/create.html.php @@ -47,7 +47,7 @@ formPanel set::label($lang->repo->projects), set::control(array("type" => "picker","multiple" => true)), set::items($projects), - set::value($relatedProjects) + set::value(empty($relatedProjects) ? '' : $relatedProjects) ), formRow ( @@ -107,6 +107,7 @@ formPanel setClass('hide-service hide-git'), formGroup ( + set::width('1/2'), set::name("path"), set::label($lang->repo->path), set::required(true), @@ -129,6 +130,7 @@ formPanel ($config->inContainer || $config->inQuickon) ? setClass('hidden') : setClass('hide-service'), formGroup ( + set::width('1/2'), set::name("client"), set::label($lang->repo->client), set::required(true), @@ -140,6 +142,7 @@ formPanel setClass('account-fields hide-service'), formGroup ( + set::width('1/2'), set::name("account"), set::label($lang->user->account), set::control("text") @@ -150,6 +153,7 @@ formPanel setClass('account-fields hide-service'), formGroup ( + set::width('1/2'), set::label($lang->user->password), inputGroup ( diff --git a/module/repo/ui/edit.html.php b/module/repo/ui/edit.html.php index 722b24dbbe..e9326704da 100644 --- a/module/repo/ui/edit.html.php +++ b/module/repo/ui/edit.html.php @@ -104,6 +104,7 @@ formPanel setClass('hide-service hide-git'), formGroup ( + set::width('1/2'), set::name("path"), set::label($lang->repo->path), set::required(true), @@ -127,6 +128,7 @@ formPanel ($config->inContainer || $config->inQuickon) ? setClass('hidden') : setClass('hide-service'), formGroup ( + set::width('1/2'), set::name("client"), set::label($lang->repo->client), set::required(true), @@ -139,6 +141,7 @@ formPanel setClass('account-fields hide-service'), formGroup ( + set::width('1/2'), set::name("account"), set::label($lang->user->account), set::control("text"), @@ -150,6 +153,7 @@ formPanel setClass('account-fields hide-service'), formGroup ( + set::width('1/2'), set::label($lang->user->password), inputGroup (