Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus into develop

app/controllers/issue_tags_controller.rb

@@ -1,5 +1,5 @@
 class IssueTagsController < ApplicationController
-  before_action :require_login
+  before_action :require_login, except: [:index]
   before_action :find_project_with_id
   before_action :set_project
   before_action :check_issue_permission, except: :index

app/controllers/issues_controller.rb

@@ -1,5 +1,5 @@
 class IssuesController < ApplicationController
-  before_action :require_login, except: [:index, :show]
+  before_action :require_login, except: [:index, :show, :index_chosen]
   before_action :find_project_with_id
   before_action :set_project_and_user
   before_action :check_project_public, only: [:index ,:show, :copy, :index_chosen, :close_issue]
@@ -11,7 +11,7 @@ class IssuesController < ApplicationController
   include TagChosenHelper
 
   def index
-    @user_admin_or_member = current_user.present? && (current_user.admin || @project.member?(current_user))
+    @user_admin_or_member = current_user.present? && current_user.logged? && (current_user.admin || @project.member?(current_user))
     issues = @project.issues.issue_issue.includes(:user,:tracker, :priority, :version, :issue_status, :journals, :issue_times)
     issues = issues.where(is_private: false) unless @user_admin_or_member
     @all_issues_size = issues.size
@@ -276,7 +276,7 @@ class IssuesController < ApplicationController
   end
 
   def show
-    @user_permission = current_user.present? && (!@issue.is_lock || @project.member?(current_user) || current_user.admin? || @issue.user == current_user)
+    @user_permission = current_user.present? && current_user.logged? && (!@issue.is_lock || @project.member?(current_user) || current_user.admin? || @issue.user == current_user)
     @issue_attachments = @issue.attachments
     @issue_user = @issue.user
     @issue_assign_to = @issue.get_assign_user

app/controllers/journals_controller.rb

@@ -1,5 +1,5 @@
 class JournalsController < ApplicationController
-  before_action :require_login
+  before_action :require_login, except: :index
   before_action :set_issue
   before_action :check_issue_permission
   before_action :set_journal, only: [:destroy, :edit, :update]

app/controllers/pull_requests_controller.rb

@@ -1,5 +1,5 @@
 class PullRequestsController < ApplicationController
-  before_action :require_login
+  before_action :require_login, except: [:index, :show]
   before_action :find_project_with_id
   before_action :set_repository
   before_action :find_pull_request, except: [:index, :new, :create, :check_can_merge]
@@ -243,7 +243,7 @@ class PullRequestsController < ApplicationController
   end
 
   def show
-    @user_permission = current_user.present? && (!@issue.is_lock || @project.member?(current_user) || current_user.admin? || @issue.user == current_user)
+    @user_permission = current_user.logged? && (!@issue.is_lock || @project.member?(current_user) || current_user.admin? || @issue.user == current_user)
     @issue_attachments = @issue.attachments
     @issue_user = @issue.user
     @issue_assign_to = @issue.get_assign_user

app/controllers/versions_controller.rb

@@ -1,5 +1,5 @@
 class VersionsController < ApplicationController
-  before_action :require_login
+  before_action :require_login, except: [:index, :show]
   before_action :find_project_with_id
   before_action :check_issue_permission, except: [:show, :index]
   before_action :set_version, only: [:edit, :update, :destroy, :show,:update_status]

app/models/project.rb

@@ -100,7 +100,7 @@ class Project < ApplicationRecord
   end
 
   def self.list_user_projects(user_id)
-    user_not_show = Project.joins(:members).where("projects.is_public = ? and (projects.user_id != ? or members.user_id != ?)", false, user_id,user_id).pluck(:id).uniq
+    user_not_show = Project.joins(:members).where("projects.is_public = ? and projects.user_id != ? and members.user_id != ?", false, user_id,user_id).pluck(:id).uniq
     Project.where.not(id: user_not_show)
   end
 

public/react/build/asset-manifest.json

@@ -2,7 +2,7 @@
   "./static/js/0.f63922c9.chunk.js": "./static/js/0.f63922c9.chunk.js",
   "./static/js/1.b5cda6a2.chunk.js": "./static/js/1.b5cda6a2.chunk.js",
   "./static/js/10.3d822567.chunk.js": "./static/js/10.3d822567.chunk.js",
-  "./static/js/100.b4c8d0d8.chunk.js": "./static/js/100.b4c8d0d8.chunk.js",
+  "./static/js/100.5bae9cbf.chunk.js": "./static/js/100.5bae9cbf.chunk.js",
   "./static/js/101.96502372.chunk.js": "./static/js/101.96502372.chunk.js",
   "./static/js/102.cd515a8f.chunk.js": "./static/js/102.cd515a8f.chunk.js",
   "./static/js/103.882462e7.chunk.js": "./static/js/103.882462e7.chunk.js",
@@ -36,7 +36,7 @@
   "./static/js/129.fc835464.chunk.js": "./static/js/129.fc835464.chunk.js",
   "./static/js/13.6f4e3672.chunk.js": "./static/js/13.6f4e3672.chunk.js",
   "./static/js/130.185125bf.chunk.js": "./static/js/130.185125bf.chunk.js",
-  "./static/js/131.24a48d61.chunk.js": "./static/js/131.24a48d61.chunk.js",
+  "./static/js/131.5e0b6117.chunk.js": "./static/js/131.5e0b6117.chunk.js",
   "./static/js/132.439a5c11.chunk.js": "./static/js/132.439a5c11.chunk.js",
   "./static/js/133.13415103.chunk.js": "./static/js/133.13415103.chunk.js",
   "./static/js/134.a7dd56df.chunk.js": "./static/js/134.a7dd56df.chunk.js",
@@ -68,21 +68,21 @@
   "./static/js/158.254164cd.chunk.js": "./static/js/158.254164cd.chunk.js",
   "./static/js/159.9cd40eed.chunk.js": "./static/js/159.9cd40eed.chunk.js",
   "./static/js/16.33ec9e50.chunk.js": "./static/js/16.33ec9e50.chunk.js",
-  "./static/js/160.d50193ba.chunk.js": "./static/js/160.d50193ba.chunk.js",
+  "./static/js/160.98ea6c74.chunk.js": "./static/js/160.98ea6c74.chunk.js",
   "./static/js/161.2aa9919a.chunk.js": "./static/js/161.2aa9919a.chunk.js",
   "./static/js/162.5aeccaa3.chunk.js": "./static/js/162.5aeccaa3.chunk.js",
   "./static/js/163.47e453a3.chunk.js": "./static/js/163.47e453a3.chunk.js",
   "./static/js/164.ada18b98.chunk.js": "./static/js/164.ada18b98.chunk.js",
   "./static/js/165.8276070b.chunk.js": "./static/js/165.8276070b.chunk.js",
   "./static/js/166.827bbaf6.chunk.js": "./static/js/166.827bbaf6.chunk.js",
-  "./static/js/167.50e0feee.chunk.js": "./static/js/167.50e0feee.chunk.js",
+  "./static/js/167.90c468ab.chunk.js": "./static/js/167.90c468ab.chunk.js",
   "./static/js/168.4cb1ef33.chunk.js": "./static/js/168.4cb1ef33.chunk.js",
-  "./static/js/169.ccdd4a03.chunk.js": "./static/js/169.ccdd4a03.chunk.js",
+  "./static/js/169.3ad67ea0.chunk.js": "./static/js/169.3ad67ea0.chunk.js",
   "./static/js/17.2ace4b94.chunk.js": "./static/js/17.2ace4b94.chunk.js",
   "./static/js/170.07831e73.chunk.js": "./static/js/170.07831e73.chunk.js",
-  "./static/js/171.b001a165.chunk.js": "./static/js/171.b001a165.chunk.js",
+  "./static/js/171.292b1b2e.chunk.js": "./static/js/171.292b1b2e.chunk.js",
   "./static/js/172.6233065c.chunk.js": "./static/js/172.6233065c.chunk.js",
-  "./static/js/173.914df15b.chunk.js": "./static/js/173.914df15b.chunk.js",
+  "./static/js/173.a0eb13f9.chunk.js": "./static/js/173.a0eb13f9.chunk.js",
   "./static/js/174.938122c7.chunk.js": "./static/js/174.938122c7.chunk.js",
   "./static/js/175.72ebbf56.chunk.js": "./static/js/175.72ebbf56.chunk.js",
   "./static/js/176.ae0214cc.chunk.js": "./static/js/176.ae0214cc.chunk.js",
@@ -125,7 +125,7 @@
   "./static/js/209.84f3043d.chunk.js": "./static/js/209.84f3043d.chunk.js",
   "./static/js/21.7ad82999.chunk.js": "./static/js/21.7ad82999.chunk.js",
   "./static/js/210.823039f6.chunk.js": "./static/js/210.823039f6.chunk.js",
-  "./static/js/211.bd6e5a32.chunk.js": "./static/js/211.bd6e5a32.chunk.js",
+  "./static/js/211.369111a6.chunk.js": "./static/js/211.369111a6.chunk.js",
   "./static/js/212.089afb22.chunk.js": "./static/js/212.089afb22.chunk.js",
   "./static/js/213.a4c081ab.chunk.js": "./static/js/213.a4c081ab.chunk.js",
   "./static/js/214.cf63af57.chunk.js": "./static/js/214.cf63af57.chunk.js",
@@ -242,28 +242,28 @@
   "./static/js/61.ca094955.chunk.js": "./static/js/61.ca094955.chunk.js",
   "./static/js/62.945b1858.chunk.js": "./static/js/62.945b1858.chunk.js",
   "./static/js/63.855801f3.chunk.js": "./static/js/63.855801f3.chunk.js",
-  "./static/js/64.7da7eb25.chunk.js": "./static/js/64.7da7eb25.chunk.js",
+  "./static/js/64.085b4fb6.chunk.js": "./static/js/64.085b4fb6.chunk.js",
   "./static/js/65.760166b2.chunk.js": "./static/js/65.760166b2.chunk.js",
   "./static/js/66.b35191d2.chunk.js": "./static/js/66.b35191d2.chunk.js",
   "./static/js/67.80c937ae.chunk.js": "./static/js/67.80c937ae.chunk.js",
   "./static/js/68.65f301d9.chunk.js": "./static/js/68.65f301d9.chunk.js",
   "./static/js/69.fa13a392.chunk.js": "./static/js/69.fa13a392.chunk.js",
   "./static/js/7.b9d4517c.chunk.js": "./static/js/7.b9d4517c.chunk.js",
-  "./static/js/70.c7a7ef03.chunk.js": "./static/js/70.c7a7ef03.chunk.js",
+  "./static/js/70.8cf5a405.chunk.js": "./static/js/70.8cf5a405.chunk.js",
   "./static/js/71.da8790c1.chunk.js": "./static/js/71.da8790c1.chunk.js",
-  "./static/js/72.107ae973.chunk.js": "./static/js/72.107ae973.chunk.js",
-  "./static/js/73.436ad435.chunk.js": "./static/js/73.436ad435.chunk.js",
+  "./static/js/72.225b456b.chunk.js": "./static/js/72.225b456b.chunk.js",
+  "./static/js/73.57f0d25d.chunk.js": "./static/js/73.57f0d25d.chunk.js",
   "./static/js/74.b4ee0232.chunk.js": "./static/js/74.b4ee0232.chunk.js",
-  "./static/js/75.968a724f.chunk.js": "./static/js/75.968a724f.chunk.js",
-  "./static/js/76.763be5ac.chunk.js": "./static/js/76.763be5ac.chunk.js",
-  "./static/js/77.6ce0c761.chunk.js": "./static/js/77.6ce0c761.chunk.js",
+  "./static/js/75.b9fd2e52.chunk.js": "./static/js/75.b9fd2e52.chunk.js",
+  "./static/js/76.5de55d56.chunk.js": "./static/js/76.5de55d56.chunk.js",
+  "./static/js/77.53bbeeca.chunk.js": "./static/js/77.53bbeeca.chunk.js",
   "./static/js/78.0cb0ffe8.chunk.js": "./static/js/78.0cb0ffe8.chunk.js",
   "./static/js/79.94f4645b.chunk.js": "./static/js/79.94f4645b.chunk.js",
   "./static/js/8.0dac0dcc.chunk.js": "./static/js/8.0dac0dcc.chunk.js",
   "./static/js/80.868b3db0.chunk.js": "./static/js/80.868b3db0.chunk.js",
-  "./static/js/81.d28d2d95.chunk.js": "./static/js/81.d28d2d95.chunk.js",
-  "./static/js/82.7ffc2d8b.chunk.js": "./static/js/82.7ffc2d8b.chunk.js",
-  "./static/js/83.85f75fa5.chunk.js": "./static/js/83.85f75fa5.chunk.js",
+  "./static/js/81.f31109b3.chunk.js": "./static/js/81.f31109b3.chunk.js",
+  "./static/js/82.f7efd2a0.chunk.js": "./static/js/82.f7efd2a0.chunk.js",
+  "./static/js/83.36f54c03.chunk.js": "./static/js/83.36f54c03.chunk.js",
   "./static/js/84.4c70d1bd.chunk.js": "./static/js/84.4c70d1bd.chunk.js",
   "./static/js/85.6236f41d.chunk.js": "./static/js/85.6236f41d.chunk.js",
   "./static/js/86.bf46b68b.chunk.js": "./static/js/86.bf46b68b.chunk.js",
@@ -277,12 +277,12 @@
   "./static/js/93.f02c8c79.chunk.js": "./static/js/93.f02c8c79.chunk.js",
   "./static/js/94.93881ee6.chunk.js": "./static/js/94.93881ee6.chunk.js",
   "./static/js/95.2e6fc4d5.chunk.js": "./static/js/95.2e6fc4d5.chunk.js",
-  "./static/js/96.a36296f1.chunk.js": "./static/js/96.a36296f1.chunk.js",
+  "./static/js/96.87d60d42.chunk.js": "./static/js/96.87d60d42.chunk.js",
   "./static/js/97.f4a216bb.chunk.js": "./static/js/97.f4a216bb.chunk.js",
   "./static/js/98.1d688383.chunk.js": "./static/js/98.1d688383.chunk.js",
   "./static/js/99.4a932041.chunk.js": "./static/js/99.4a932041.chunk.js",
   "main.css": "./static/css/main.fd229636.css",
-  "main.js": "./static/js/main.a9130663.js",
+  "main.js": "./static/js/main.f7465af3.js",
   "static/media/KaTeX_AMS-Regular.ttf": "static/media/KaTeX_AMS-Regular.aaf4eee9.ttf",
   "static/media/KaTeX_AMS-Regular.woff": "static/media/KaTeX_AMS-Regular.7f06b4e3.woff",
   "static/media/KaTeX_AMS-Regular.woff2": "static/media/KaTeX_AMS-Regular.e78e28b4.woff2",

public/react/build/index.html

@@ -24,7 +24,7 @@
                 _host = 'https://ali-cdn.educoder.net/react/build/'
             }
             document.write('<script type="text/javascript" src="' + _host + 'js/js_min_all.js"><\/script>');
-            document.write('<script type="text/javascript" src="' + _host + 'static/js/main.a9130663.js"><\/script>');
+            document.write('<script type="text/javascript" src="' + _host + 'static/js/main.f7465af3.js"><\/script>');
          })()
       </script>
     <script>!function(){var t=location.href;"3007"===window.location.port?-1!=t.indexOf("/tasks/")?(document.write('<script type="text/javascript" src="https://newweb.educoder.net/assets/kindeditor/kindeditor.js"><\/script>'),document.write('<script type="text/javascript" src="/react/build/js/create_kindeditor.js?v=1.1.1"><\/script>'),document.write('<script type="text/javascript" src="https://newweb.educoder.net/javascripts/educoder/edu_application.js"><\/script>')):-1!=t.indexOf("/paths/")&&document.write('<script type="text/javascript" src="https://newweb.educoder.net/javascripts/educoder/edu_application.js"><\/script>'):-1!=t.indexOf("/tasks/")?(document.write('<script type="text/javascript" src="/assets/kindeditor/kindeditor.js"><\/script>'),document.write('<script type="text/javascript" src="/react/build/js/create_kindeditor.js?v=1.1.1"><\/script>'),document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>')):-1!=t.indexOf("/paths/")&&document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>')}()</script><script type="text/javascript" src="https://cdn.bootcss.com/quill/1.3.7/quill.core.min.js"></script></body></html>