Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

This commit is contained in:
Wen 2014-04-03 08:49:35 +08:00
commit e5470db875
1 changed files with 2 additions and 1 deletions

View File

@ -1,3 +1,4 @@
# encoding: utf-8
# This controller was added by william # This controller was added by william
class TagsController < ApplicationController class TagsController < ApplicationController
layout "base_tags" layout "base_tags"
@ -22,7 +23,7 @@ class TagsController < ApplicationController
NUMBERS = Setting.tags_show_search_results NUMBERS = Setting.tags_show_search_results
# 预设几个可以添加的tag # 预设几个可以添加的tag
@preTags = %w|预设A 预设B 预设C 预设D 预设E 预设F | #@preTags = %w|预设A 预设B 预设C 预设D 预设E 预设F |
# 接收参数解释: # 接收参数解释:
# params[:q]这是在其他页面点击tag跳转到该页面后的结果显示 ;params[:selected_tags]这是在过滤页面增删tag进行过滤传过来的参数 # params[:q]这是在其他页面点击tag跳转到该页面后的结果显示 ;params[:selected_tags]这是在过滤页面增删tag进行过滤传过来的参数