diff --git a/module/gitea/control.php b/module/gitea/control.php
index 37365980d8..9b185ceae0 100644
--- a/module/gitea/control.php
+++ b/module/gitea/control.php
@@ -22,7 +22,7 @@ class gitea extends control
/* This is essential when changing tab(menu) from gitea to repo. */
/* Optional: common::setMenuVars('devops', $this->session->repoID); */
- $this->loadModel('ci')->setMenu();
+ if($this->app->rawMethod != 'binduser') $this->loadModel('ci')->setMenu();
}
/**
diff --git a/module/gitea/model.php b/module/gitea/model.php
index d49937cb87..48d55485b1 100644
--- a/module/gitea/model.php
+++ b/module/gitea/model.php
@@ -400,7 +400,7 @@ class giteaModel extends model
for($page = 1; true; $page++)
{
$results = json_decode(commonModel::http($url . "&page={$page}&limit=50"));
- if(!is_array($results->data)) break;
+ if(empty($results) || !is_array($results->data)) break;
if(!empty($results->data)) $allResults = array_merge($allResults, $results->data);
if(count($results->data) < 50) break;
}
diff --git a/module/gitea/view/binduser.html.php b/module/gitea/view/binduser.html.php
index bac7b14aae..faddecc316 100644
--- a/module/gitea/view/binduser.html.php
+++ b/module/gitea/view/binduser.html.php
@@ -74,7 +74,7 @@
|
- goback, '', 'class="btn btn-wide"');?>
+ createLink('space', 'browse'), $lang->goback, '', 'class="btn btn-wide"');?>
|
diff --git a/module/gogs/control.php b/module/gogs/control.php
index 77ef72dfcd..d72de3abc2 100644
--- a/module/gogs/control.php
+++ b/module/gogs/control.php
@@ -22,7 +22,7 @@ class gogs extends control
/* This is essential when changing tab(menu) from gogs to repo. */
/* Optional: common::setMenuVars('devops', $this->session->repoID); */
- $this->loadModel('ci')->setMenu();
+ if($this->app->rawMethod != 'binduser') $this->loadModel('ci')->setMenu();
}
/**
diff --git a/module/gogs/view/binduser.html.php b/module/gogs/view/binduser.html.php
index c9d68f3527..fe6468104e 100644
--- a/module/gogs/view/binduser.html.php
+++ b/module/gogs/view/binduser.html.php
@@ -74,7 +74,7 @@
|
- goback, '', 'class="btn btn-wide"');?>
+ createLink('space', 'browse'), $lang->goback, '', 'class="btn btn-wide"');?>
|
diff --git a/module/index/config.php b/module/index/config.php
index 7cc58f5560..0cfdd16e3d 100644
--- a/module/index/config.php
+++ b/module/index/config.php
@@ -42,3 +42,5 @@ $config->index->oldPages[] = 'webhook-create';
$config->index->oldPages[] = 'dept-browse';
$config->index->oldPages[] = 'repo-setrules';
$config->index->oldPages[] = 'host-treemap';
+$config->index->oldPages[] = 'gogs-binduser';
+$config->index->oldPages[] = 'gitea-binduser';
diff --git a/module/repo/control.php b/module/repo/control.php
index e25c0cf1f6..e4e381e77a 100644
--- a/module/repo/control.php
+++ b/module/repo/control.php
@@ -1754,10 +1754,6 @@ class repo extends control
public function ajaxGetGiteaProjects($giteaID)
{
$projects = $this->loadModel('gitea')->apiGetProjects($giteaID);
- if(!$projects) $this->send(array('message' => array()));
-
- $options = "";
- foreach($projects as $project) $options .= "";
$options = array();
$options[] = array('text' => '', 'value' => '');;
@@ -1779,11 +1775,6 @@ class repo extends control
public function ajaxGetGogsProjects($gogsID)
{
$projects = $this->loadModel('gogs')->apiGetProjects($gogsID);
- $options = "";
- if(!empty($projects))
- {
- foreach($projects as $project) $options .= "";
- }
$options = array();
$options[] = array('text' => '', 'value' => '');;
@@ -1808,12 +1799,6 @@ class repo extends control
if(!$projects) return print('[]');
$projectIdList = $projectIdList ? explode(',', $projectIdList) : null;
- $options = "";
- foreach($projects as $project)
- {
- if(!empty($projectIdList) and $project and !in_array($project->id, $projectIdList)) continue;
- $options .= "";
- }
$options = array();
$options[] = array('text' => '', 'value' => '');;