From 8f8ce421d97e383874c864f1a3e6ae7d0fffaa80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 9 Dec 2019 11:55:49 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/home/shixunsHome.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/home/shixunsHome.js b/public/react/src/modules/home/shixunsHome.js
index 52f7407fd..260436807 100644
--- a/public/react/src/modules/home/shixunsHome.js
+++ b/public/react/src/modules/home/shixunsHome.js
@@ -242,7 +242,7 @@ class ShixunsHome extends Component {
                                 </div>
                                 <Link to={"/paths"} className="moreitem">更多<i className="fa fa-angle-right ml5"></i></Link>
 
-                                <div className="square-list clearfix" style={{'width':'100%','padding-left':'20px'}}>
+                                <div className="square-list clearfix" style={{'width':'100%','padding-left':'25px'}}>
 
 
                                     {homedatalist===undefined?"":homedatalist.subjects.map((item,key)=>{
@@ -321,7 +321,7 @@ class ShixunsHome extends Component {
                                 </div>
                                 <Link to={"/shixuns"} className="moreitem">更多<i className="fa fa-angle-right ml5"></i></Link>
 
-                                <div className="square-list clearfix" style={{'width':'100%','padding-left':'20px'}}>
+                                <div className="square-list clearfix" style={{'width':'100%','padding-left':'25px'}}>
 																	<style>
 																		{
 																			`

From 0ca6108f089637a91995fe92e740245f17ac912d Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 9 Dec 2019 16:13:14 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E7=94=A8=E6=88=B7Oj=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/hack.rb                                   | 5 +++++
 app/views/hack_user_lastest_codes/show.json.jbuilder | 4 ++++
 app/views/hacks/edit.json.jbuilder                   | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/models/hack.rb b/app/models/hack.rb
index 9b7241bda..a32e91325 100644
--- a/app/models/hack.rb
+++ b/app/models/hack.rb
@@ -41,4 +41,9 @@ class Hack < ApplicationRecord
     hack_sets.first&.input
   end
 
+  # 管理员
+  def manager?
+    user_id == current_user.id || current_user.admin_or_business?
+  end
+
 end
diff --git a/app/views/hack_user_lastest_codes/show.json.jbuilder b/app/views/hack_user_lastest_codes/show.json.jbuilder
index 692c49d95..f6fde6261 100644
--- a/app/views/hack_user_lastest_codes/show.json.jbuilder
+++ b/app/views/hack_user_lastest_codes/show.json.jbuilder
@@ -14,4 +14,8 @@ end
 
 json.user do
   json.partial! 'users/user', user: current_user
+end
+
+json.user_auth do
+  json.manager @hack.manager?
 end
\ No newline at end of file
diff --git a/app/views/hacks/edit.json.jbuilder b/app/views/hacks/edit.json.jbuilder
index bb005410f..e6fee65b8 100644
--- a/app/views/hacks/edit.json.jbuilder
+++ b/app/views/hacks/edit.json.jbuilder
@@ -1,5 +1,5 @@
 # 编程内容
-json.(@hack, :name, :description, :language, :difficult, :category, :time_limit, :open_or_not)
+json.(@hack, :name, :description, :language, :difficult, :category, :time_limit, :open_or_not, :status)
 
 # 代码
 json.language @hack.language

From 4257028358f5d087a9fd1e8c72862429b8ce5459 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 9 Dec 2019 16:16:42 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/hack.rb                                   | 4 ++--
 app/views/hack_user_lastest_codes/show.json.jbuilder | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/hack.rb b/app/models/hack.rb
index a32e91325..506cd4942 100644
--- a/app/models/hack.rb
+++ b/app/models/hack.rb
@@ -42,8 +42,8 @@ class Hack < ApplicationRecord
   end
 
   # 管理员
-  def manager?
-    user_id == current_user.id || current_user.admin_or_business?
+  def manager?(user)
+    user_id == user.id || user.admin_or_business?
   end
 
 end
diff --git a/app/views/hack_user_lastest_codes/show.json.jbuilder b/app/views/hack_user_lastest_codes/show.json.jbuilder
index f6fde6261..984311544 100644
--- a/app/views/hack_user_lastest_codes/show.json.jbuilder
+++ b/app/views/hack_user_lastest_codes/show.json.jbuilder
@@ -17,5 +17,5 @@ json.user do
 end
 
 json.user_auth do
-  json.manager @hack.manager?
+  json.manager @hack.manager?(current_user)
 end
\ No newline at end of file

From 6d12aa4b56aef4585db78a808bbb0e8ca8d305e7 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 9 Dec 2019 16:17:59 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E8=BA=AB?=
 =?UTF-8?q?=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/hack_user_lastest_codes/show.json.jbuilder | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/views/hack_user_lastest_codes/show.json.jbuilder b/app/views/hack_user_lastest_codes/show.json.jbuilder
index 984311544..67f154212 100644
--- a/app/views/hack_user_lastest_codes/show.json.jbuilder
+++ b/app/views/hack_user_lastest_codes/show.json.jbuilder
@@ -14,8 +14,6 @@ end
 
 json.user do
   json.partial! 'users/user', user: current_user
-end
-
-json.user_auth do
   json.manager @hack.manager?(current_user)
+
 end
\ No newline at end of file

From 54e36ea2e7ab60e606e2b65c82837e6bd255bede Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 9 Dec 2019 16:19:42 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/hack_user_lastest_codes/show.json.jbuilder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/hack_user_lastest_codes/show.json.jbuilder b/app/views/hack_user_lastest_codes/show.json.jbuilder
index 67f154212..2d7ffd2bf 100644
--- a/app/views/hack_user_lastest_codes/show.json.jbuilder
+++ b/app/views/hack_user_lastest_codes/show.json.jbuilder
@@ -14,6 +14,6 @@ end
 
 json.user do
   json.partial! 'users/user', user: current_user
-  json.manager @hack.manager?(current_user)
+  json.hack_manager @hack.manager?(current_user)
 
 end
\ No newline at end of file