From 956aa3d0c173870ad3a43cb716f0060105c34fcc Mon Sep 17 00:00:00 2001 From: xianbo Date: Thu, 10 Oct 2013 21:41:42 +0800 Subject: [PATCH] remove forum block in course setting --- app/controllers/projects_controller.rb | 5 +++-- app/helpers/projects_helper.rb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 174c4cdd9..3726856b8 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -643,8 +643,9 @@ class ProjectsController < ApplicationController @subprojects = @project.children.visible.all @news = @project.news.limit(5).includes(:author, :project).reorder("#{News.table_name}.created_on DESC").all @trackers = @project.rolled_up_trackers - @user = User.find_by_id(ProjectInfo.find_by_project_id(@project.id).user_id) - + if(User.find_by_id(ProjectInfo.find_by_project_id(@project.id).user_id)) + @user = User.find_by_id(ProjectInfo.find_by_project_id(@project.id).user_id) + end cond = @project.project_condition(Setting.display_subprojects_issues?) @open_issues_by_tracker = Issue.visible.open.where(cond).count(:group => :tracker) @total_issues_by_tracker = Issue.visible.where(cond).count(:group => :tracker) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index e18aa8f2a..8e792d690 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -133,7 +133,7 @@ module ProjectsHelper #Added by young def course_settings_tabs tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural, :course=>'1'}, - {:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural}, + # {:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural}, # {:name => 'repositories', :action => :manage_repository, :partial => 'projects/settings/repositories', :label => :label_repository_plural}, {:name => 'members', :action => :manage_members, :partial => 'projects/settings/members', :label => :label_member_plural} ]