From 8414e92bbe99e9717baddc55d678add1e5c574fc Mon Sep 17 00:00:00 2001 From: z9hang Date: Sat, 22 Nov 2014 15:25:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E8=B7=B3=E8=BD=AC=E5=88=B0=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=89=98=E7=AE=A1=E5=B9=B3=E5=8F=B0=E4=B8=BB=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/welcome_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 2a5792e36..94717a4ce 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -163,7 +163,7 @@ class WelcomeController < ApplicationController return 0 elsif url.include?(Setting.host_user.gsub('/','')) - redirect_to(:controller => "users", :action => "index") + #redirect_to(:controller => "users", :action => "index") end From 0a6574b54284ae5fa44ede301410df4ce60a605e Mon Sep 17 00:00:00 2001 From: z9hang Date: Sat, 22 Nov 2014 15:35:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=AF=BE=E7=A8=8B=E6=8C=89=E9=92=AE=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=89=80=E6=9C=89=E4=BA=BA=E9=83=BD?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=9C=8B=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/_more_course.html.erb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/views/welcome/_more_course.html.erb b/app/views/welcome/_more_course.html.erb index 8d0f1564c..2c8d92719 100644 --- a/app/views/welcome/_more_course.html.erb +++ b/app/views/welcome/_more_course.html.erb @@ -1,8 +1,6 @@ <% if User.current.logged?%> - <% if User.current.user_extensions.identity == 0 %> <%= link_to(l(:label_course_new), {:controller => 'courses', :action => 'new'}, :class => 'icon icon-add') if User.current.allowed_to?(:add_course,nil, :global => true) %> - <% end %>      <%= link_to l(:label_course_join_student), join_private_courses_courses_path ,:remote => true, :class => 'icon icon-add' %>