添加<公共贴吧 无帖子置顶功能 建议增加>,<管理员可以根据贴吧的热度选择将贴吧置顶>

Signed-off-by: alan <547533434@qq.com>
course_group
alan 11 years ago
parent fecf9513b9
commit 8cec84dca7

@ -52,7 +52,7 @@ class ForumsController < ApplicationController
def index
@offset, @limit = api_offset_and_limit({:limit => 10})
@forums_all = Forum.where('1=1')
@forums_all = Forum.reorder("sticky DESC")
@forums_count = @forums_all.count
@forums_pages = Paginator.new @forums_count, @limit, params['page']
@ -208,6 +208,8 @@ class ForumsController < ApplicationController
end
end
private

@ -8,7 +8,9 @@ class Forum < ActiveRecord::Base
'topic_count',
'memo_count',
'last_memo_id',
'creator_id'
'creator_id',
'sticky',
'locked'
validates_presence_of :name, :creator_id, :description
validates_length_of :name, maximum: 50
#validates_length_of :description, maximum: 255

@ -17,6 +17,18 @@
<div class="field">
<%= f.text_field :name, :required => true, :style => 'width: 100%;', :class => 'create-share' %>
</div>
<div>
<% if User.current.logged? && User.current.admin? %>
<% if @forum.safe_attribute? 'sticky' %>
<%= f.check_box :sticky %>
<%= label_tag 'message_sticky', l(:label_board_sticky) %>
<% end %>
<% if @forum.safe_attribute? 'locked' %>
<%= f.check_box :locked %>
<%= label_tag 'message_locked', l(:label_board_locked) %>
<% end %>
<% end %>
</div>
<div>
<script src="http://<%= Setting.host_name%>/javascripts/ckeditor/ckeditor.js?1404953555" type="text/javascript"></script>
<p style="max-width:680px">

@ -7,9 +7,14 @@
<%= forum.creator.nil? ? (link_to image_tag(url_to_avatar(forum.creator), :class => "avatar")) : (link_to image_tag(url_to_avatar(forum.creator), :class => "avatar"), user_path(forum.creator)) %>
</div>
<div class="forums-index-content">
<p ><%= link_to h(forum.name), forum_path(forum) %></p>
<p ><%= textAreailizable forum.description%></p>
<p ><%= authoring forum.created_at, forum.creator %></p></div>
<table class="content-text-list">
<tr><td valign="top" width="500px" class=" <%= forum.sticky? ? 'sticky' : '' %>
<%= forum.locked? ? 'locked' : '' %>">
<p ><%= link_to h(forum.name), forum_path(forum) %></p></td></tr>
<tr><td><p ><%= textAreailizable forum.description%></p></td></tr>
<tr><td><p ><%= authoring forum.created_at, forum.creator %></p></td></tr>
</table>
</div>
<div class="forums-index-count">
<table class="forums-count-color"><tr class="forums-count-color" align="center"><td><%= link_to (forum.memo_count), forum_path(forum) %></td><td><%= link_to (forum.topic_count), forum_path(forum) %></td></tr>
<tr align="center"><td>回答</td><td>帖子</td></tr></table></div>

@ -11,7 +11,8 @@
<td rowspan="2">
<% if User.current.logged? %>
<%= link_to( l(:label_forum_new), new_forum_path, :class => 'icon icon-add') %>
<% end %>
<% end %>
</td>
<td rowspan="2" width="250px" >
<div class="top-content-search">

@ -1,3 +1,3 @@
<%= error_messages_for 'bid' %>
<p><%= f.text_field :content, :required => true, :size => 60, :style => "width:150px;" %></p>
<p><%= hidden_field_tag 'subject', ||=@memo.subject %>
<p><%= hidden_field_tag 'subject'||=@memo.subject %>

@ -1960,6 +1960,7 @@ zh:
label_memo_new_from_forum: 发布帖子
label_forum: 公共贴吧
label_forum_new: 新建贴吧
label_forum_set: 贴吧设置
label_tags_forum_description: 贴吧描述
label_tags_forum: 贴吧名称
label_project_module_forums: 公共贴吧

@ -157,6 +157,7 @@ RedmineApp::Application.routes.draw do
resources :forums do
collection do
match 'search_forum', :via => [:get, :post]
end
member do
post 'create_memo'

@ -1,26 +0,0 @@
#encoding=UTF-8
class AddDataForSchool < ActiveRecord::Migration
def up
sql = " Insert into schools (name, province, logo_link) values
('香港大学','香港','/images/transparent.png'),
('香港大学','香港','/images/transparent.png'),
('香港中文大学','香港','/images/transparent.png'),
('香港科技大学','香港','/images/transparent.png'),('香港理工大学','香港','/images/transparent.png'),
('香港城市大学','香港','/images/transparent.png'),('香港浸会大学','香港','/images/transparent.png'),
('香港教育学院','香港','/images/transparent.png'),('香港歌德学院','香港','/images/transparent.png'),
('香港岭南大学','香港','/images/transparent.png'),('澳门大学','澳门','/images/transparent.png'),
('澳门理工学院','澳门','/images/transparent.png'),('澳门科技大学','澳门','/images/transparent.png'),
('澳门保安部队高等学校','澳门','/images/transparent.png'),('亚洲国际公开大学','澳门','/images/transparent.png'),
('澳门旅游学院','澳门','/images/transparent.png'),('清华大学(新竹)','台湾','/images/transparent.png'),
('台湾大学','台湾','/images/transparent.png'),('交通大学','台湾','/images/transparent.png'),
('中央大学','台湾','/images/transparent.png'),('成功大学','台湾','/images/transparent.png'),
('中山大学','台湾','/images/transparent.png'),('中原大学','台湾','/images/transparent.png'),
('政治大学','台湾','/images/transparent.png'),('元智大学','台湾','/images/transparent.png'),
('天主教辅仁大学','台湾','/images/transparent.png'),('台湾科技大学','台湾','/images/transparent.png'),
('台湾师范大学','台湾','/images/transparent.png'),('台湾艺术大学','台湾','/images/transparent.png')"
execute(sql)
end
def down
end
end

@ -0,0 +1,6 @@
class AddColumnToForums < ActiveRecord::Migration
def change
add_column :forums, :sticky, :integer
add_column :forums, :locked, :integer
end
end

@ -0,0 +1,9 @@
class SetStickyLockedForForum < ActiveRecord::Migration
def up
sql = "update forums set sticky=0, locked = 0 "
execute(sql)
end
def down
end
end

@ -0,0 +1,29 @@
#encoding=UTF-8
class AddDataForSchoolName < ActiveRecord::Migration
def up
sql = " Insert into schools (name, province, logo_link, created_at, updated_at) values
('香港大学','香港','/images/transparent.png', NOW(),NOW()),
('香港大学','香港','/images/transparent.png',NOW(),NOW()),
('香港中文大学','香港','/images/transparent.png',NOW(),NOW()),
('香港科技大学','香港','/images/transparent.png',NOW(),NOW()),('香港理工大学','香港','/images/transparent.png',NOW(),NOW()),
('香港城市大学','香港','/images/transparent.png',NOW(),NOW()),('香港浸会大学','香港','/images/transparent.png',NOW(),NOW()),
('香港教育学院','香港','/images/transparent.png',NOW(),NOW()),('香港歌德学院','香港','/images/transparent.png',NOW(),NOW()),
('香港岭南大学','香港','/images/transparent.png',NOW(),NOW()),('澳门大学','澳门','/images/transparent.png',NOW(),NOW()),
('澳门理工学院','澳门','/images/transparent.png',NOW(),NOW()),('澳门科技大学','澳门','/images/transparent.png',NOW(),NOW()),
('澳门保安部队高等学校','澳门','/images/transparent.png',NOW(),NOW()),('亚洲国际公开大学','澳门','/images/transparent.png',NOW(),NOW()),
('澳门旅游学院','澳门','/images/transparent.png',NOW(),NOW()),('清华大学(新竹)','台湾','/images/transparent.png',NOW(),NOW()),
('台湾大学','台湾','/images/transparent.png',NOW(),NOW()),('交通大学','台湾','/images/transparent.png',NOW(),NOW()),
('中央大学','台湾','/images/transparent.png',NOW(),NOW()),('成功大学','台湾','/images/transparent.png',NOW(),NOW()),
('中山大学','台湾','/images/transparent.png',NOW(),NOW()),('中原大学','台湾','/images/transparent.png',NOW(),NOW()),
('政治大学','台湾','/images/transparent.png',NOW(),NOW()),('元智大学','台湾','/images/transparent.png',NOW(),NOW()),
('天主教辅仁大学','台湾','/images/transparent.png',NOW(),NOW()),('台湾科技大学','台湾','/images/transparent.png',NOW(),NOW()),
('台湾师范大学','台湾','/images/transparent.png',NOW(),NOW()),('台湾艺术大学','台湾','/images/transparent.png',NOW(),NOW())"
execute(sql)
end
def down
end
end

@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20141031122331) do
ActiveRecord::Schema.define(:version => 20141103065703) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@ -457,6 +457,8 @@ ActiveRecord::Schema.define(:version => 20141031122331) do
t.integer "creator_id", :null => false
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.integer "sticky"
t.integer "locked"
end
create_table "groups_users", :id => false, :force => true do |t|

Loading…
Cancel
Save