From f282d971e36c667bd8047c33f166963252331ae8 Mon Sep 17 00:00:00 2001 From: jasder Date: Sun, 28 Mar 2021 19:56:11 +0800 Subject: [PATCH] FIX get branches api bug and project menu list bug --- app/controllers/projects_controller.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 6ef2fb50..3a9d859e 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -11,7 +11,7 @@ class ProjectsController < ApplicationController menu = [] menu.append(menu_hash_by_name("home")) - menu.append(menu_hash_by_name("code")) + menu.append(menu_hash_by_name("code")) if @project.has_menu_permission("code") menu.append(menu_hash_by_name("issues")) if @project.has_menu_permission("issues") menu.append(menu_hash_by_name("pulls")) if @project.has_menu_permission("pulls") menu.append(menu_hash_by_name("devops")) if @project.has_menu_permission("devops") @@ -66,7 +66,10 @@ class ProjectsController < ApplicationController end def branches - @branches = @project.forge? ? Gitea::Repository::Branches::ListService.new(@owner, @project.identifier).call : [] + return @branches = [] unless @project.forge? + + result = Gitea::Repository::Branches::ListService.call(@owner, @project.identifier) + @branches = result.is_a?(Hash) && result.key?(:status) ? [] : result end def group_type_list @@ -93,7 +96,7 @@ class ProjectsController < ApplicationController ActiveRecord::Base.transaction do # Projects::CreateForm.new(project_params).validate! private = params[:private] || false - + new_project_params = project_params.except(:private).merge(is_public: !private) @project.update_attributes!(new_project_params) gitea_params = {