From bb98dad64c9b6f53e1c6e9e862c26e48d972be9a Mon Sep 17 00:00:00 2001
From: Jasder <2053003901@@qq.com>
Date: Fri, 11 Sep 2020 22:40:32 +0800
Subject: [PATCH 1/3] FIX educoder auto register

---
 app/controllers/oauth/educoder_controller.rb | 2 +-
 app/views/oauth/register.html.erb            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/oauth/educoder_controller.rb b/app/controllers/oauth/educoder_controller.rb
index f27b8b6d3..8ed537d6c 100644
--- a/app/controllers/oauth/educoder_controller.rb
+++ b/app/controllers/oauth/educoder_controller.rb
@@ -25,7 +25,7 @@ class Oauth::EducoderController < Oauth::BaseController
 
           redirect_to callback_url
         else
-          redirect_to oauth_register_path(login: login, callback_url: callback_url)
+          redirect_to oauth_register_path(login: login, mail: mail, callback_url: callback_url)
         end
       end
     rescue WechatOauth::Error => ex
diff --git a/app/views/oauth/register.html.erb b/app/views/oauth/register.html.erb
index 59a3d4857..96778fa06 100644
--- a/app/views/oauth/register.html.erb
+++ b/app/views/oauth/register.html.erb
@@ -11,7 +11,7 @@
       </div>
       <div class="indexInfo">
         <span>邮箱：</span>
-        <%= text_field_tag :mail, '', placeholder: '请输入绑定邮箱', maxlength: 40, id: 'email' %>
+        <%= text_field_tag :mail, params[:mail], placeholder: '请输入绑定邮箱', maxlength: 40, id: 'email' %>
         <p class="checkInfo emailCheck"><span></span></p>
       </div>
       <div class="indexInfo">

From b785105730b63aba7d8e2cc8f788954b15f483d9 Mon Sep 17 00:00:00 2001
From: Jasder <2053003901@@qq.com>
Date: Fri, 11 Sep 2020 23:04:16 +0800
Subject: [PATCH 2/3] FIX get sub entries bug

---
 app/controllers/repositories_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 3776cade4..7a6b7991a 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -41,7 +41,7 @@ class RepositoriesController < ApplicationController
     interactor = Repositories::EntriesInteractor.call(@project.owner, @project.identifier, file_path_uri, ref: @ref)
     if interactor.success?
       result = interactor.result
-      return @sub_entries = [] if result[:status] == -1
+      return @sub_entries = [] if result.is_a?(Hash) && result[:status] == -1
 
       @sub_entries = [] << result unless result.is_a? Array
       @sub_entries = @sub_entries.sort_by{ |hash| hash['type'] }

From e7ff26faa52006b0ccd148d1608110f72c616d04 Mon Sep 17 00:00:00 2001
From: Jasder <2053003901@@qq.com>
Date: Fri, 11 Sep 2020 23:20:18 +0800
Subject: [PATCH 3/3] FIX code bug

---
 app/controllers/repositories_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 7a6b7991a..566881ffd 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -43,7 +43,7 @@ class RepositoriesController < ApplicationController
       result = interactor.result
       return @sub_entries = [] if result.is_a?(Hash) && result[:status] == -1
 
-      @sub_entries = [] << result unless result.is_a? Array
+      @sub_entries = result.is_a?(Array) ? result : [result]
       @sub_entries = @sub_entries.sort_by{ |hash| hash['type'] }
     else
       render_error(interactor.error)