Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
This commit is contained in:
commit
943f428aad
|
@ -555,7 +555,6 @@ class ProjectsController < ApplicationController
|
|||
|
||||
# Show @project
|
||||
def show
|
||||
|
||||
@project_type = params[:project_type]
|
||||
|
||||
# try to redirect to the requested menu item
|
||||
|
|
|
@ -635,6 +635,11 @@ module ApplicationHelper
|
|||
end
|
||||
|
||||
def html_title(*args)
|
||||
#點擊項目版本庫 多觸發一次 字符串為"/"
|
||||
#暫時解決方法 直接判斷
|
||||
if(args == ["/"])
|
||||
args = []
|
||||
end
|
||||
first_page = FirstPage.where("page_type = 'project'").first
|
||||
if args.empty?
|
||||
title = @html_title || []
|
||||
|
|
Loading…
Reference in New Issue