diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index 53fb21b8c..434ea4470 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -101,8 +101,9 @@ class BoardsController < ApplicationController
@topic_count = @board ? @board.topics.count : 0
if @project
@topic_pages = Paginator.new @topic_count, per_page_option, params['page']
+ #现在发布帖子的时候置顶功能已经没有了。所以取消这个置顶排序 #{Message.table_name}.sticky DESC,
@topics = @board.topics.
- reorder("#{Message.table_name}.sticky DESC, #{Message.table_name}.created_on desc").
+ reorder("#{Message.table_name}.created_on desc").
includes(:last_reply).
limit(@topic_pages.per_page).
offset(@topic_pages.offset).
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index f9b5b7d32..2c7df84cf 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -160,6 +160,7 @@ class MessagesController < ApplicationController
@reply.safe_attributes = params[:reply]
@reply.content = @quote + @reply.content
@reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject]
+ # @reply.reply_id = params[:id]
@topic.children << @reply
user_activity = UserActivity.where("act_type='Message' and act_id =#{@topic.id}").first
user_activity.updated_at = Time.now
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 414ef6d70..251c47d4c 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -189,6 +189,7 @@ class ProjectsController < ApplicationController
@project.organization_id = params[:organization_id]
@project.user_id = User.current.id
@project.project_new_type = params[:project_new_type]
+ params[:project][:is_public] ? @project.is_public = 1 : @project.is_public = 0
if validate_parent_id && @project.save
@project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
# Add current user as a project member if he is not admin
diff --git a/app/models/homework_detail_programing.rb b/app/models/homework_detail_programing.rb
index 2877ed6c1..0c445d672 100644
--- a/app/models/homework_detail_programing.rb
+++ b/app/models/homework_detail_programing.rb
@@ -4,6 +4,6 @@ class HomeworkDetailPrograming < ActiveRecord::Base
belongs_to :homework_common
def language_name
- %W(C C++ Python).at(self.language.to_i - 1)
+ %W(C C++ Python Java).at(self.language.to_i - 1)
end
end
diff --git a/app/models/message.rb b/app/models/message.rb
index 37129885f..2c46857f8 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -86,7 +86,7 @@ class Message < ActiveRecord::Base
}
- safe_attributes 'subject', 'content'
+ safe_attributes 'subject', 'content', 'reply_id'
safe_attributes 'board_id','locked', 'sticky',
:if => lambda {|message, user|
if message.project
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 3cfd4ae72..4f022261f 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -51,9 +51,9 @@
:data => {:confirm => l(:text_are_you_sure)},
:class => 'talk_edit fr',
:style => ' margin-right: 10px;') if topic.destroyable_by?(User.current) %>
- <% if topic.sticky? %>
- <%= l(:label_board_sticky)%>
- <% end %>
+ <%# if topic.sticky? %>
+
+ <%# end %>