developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Rulingcom/NCCU

This commit is contained in:
Christophe Vilayphiou 2012-08-13 11:20:23 +08:00
parent 2ea3193879 080974b563
commit 92fc0c8c26
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/pages_controller.rb
View File

@ -16,7 +16,6 @@ class PagesController < ApplicationController
def show def show
#begin #begin
@item = Item.first(:conditions => {:path => params[:page_name]}) @item = Item.first(:conditions => {:path => params[:page_name]})
if @item && @item.is_published #&& (@item.enabled_for.nil? ? true : @item.enabled_for.include?(I18n.locale.to_s)) if @item && @item.is_published #&& (@item.enabled_for.nil? ? true : @item.enabled_for.include?(I18n.locale.to_s))
impressionist(@item) impressionist(@item)

3
config/initializers/resque_auth.rb Normal file
View File

@ -0,0 +1,3 @@
Resque::Server.use(Rack::Auth::Basic) do |user, password|
password == "SD-7506D"
end

2
config/locales/zh_tw.yml
View File

@ -148,7 +148,7 @@ zh_tw:
create_success_snippet: 片段已成功新增。 create_success_snippet: 片段已成功新增。
create_success_user: 用戶已成功新增。。 create_success_user: 用戶已成功新增。。
dashboard: 儀表板 dashboard: 儀表板
data: 資料數據 data: 選擇檔案
delete_language: 刪除語言 delete_language: 刪除語言
description: 描述 description: 描述
design: 版型管理 design: 版型管理

4
vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb vendored
View File

@ -1,8 +1,8 @@
module Panel::Announcement::BackEnd::BulletinsHelper module Panel::Announcement::BackEnd::BulletinsHelper
def show_form_status_field(bulletin) def show_form_status_field(bulletin)
by_bulletin = (!bulletin.is_expired? and bulletin.is_pending?) #by_bulletin = (!bulletin.is_expired? and bulletin.is_pending?)
by_user = ((bulletin.bulletin_category.authed_users('fact_check').include?(current_user) rescue nil) or is_manager? or is_admin?) by_user = ((bulletin.bulletin_category.authed_users('fact_check').include?(current_user) rescue nil) or is_manager? or is_admin?)
by_bulletin and by_user by_user
end end
def show_approval_link(bulletin) def show_approval_link(bulletin)

2
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_bulletins.html.erb vendored
View File

@ -1,6 +1,6 @@
<% @bulletins.each do |bulletin| %> <% @bulletins.each do |bulletin| %>
<li> <li>
<%= link_to bulletin.title, panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category_id) %> <%= link_to bulletin.title, panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category_id ,:tag_id=>bulletin.tags.first.id ) %>
</li> </li>
<% end %> <% end %>

4
vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb vendored
View File

@ -1,8 +1,8 @@
module Panel::News::BackEnd::NewsBulletinsHelper module Panel::News::BackEnd::NewsBulletinsHelper
def news_show_form_status_field(news_bulletin) def news_show_form_status_field(news_bulletin)
by_news_bulletin = (!news_bulletin.is_expired? and news_bulletin.is_pending?) #by_news_bulletin = (!news_bulletin.is_expired? and news_bulletin.is_pending?)
by_user = ((news_bulletin.news_bulletin_category.authed_users('fact_check').include?(current_user) rescue nil) or is_manager? or is_admin?) by_user = ((news_bulletin.news_bulletin_category.authed_users('fact_check').include?(current_user) rescue nil) or is_manager? or is_admin?)
by_news_bulletin and by_user by_user
end end
def news_show_approval_link(news_bulletin) def news_show_approval_link(news_bulletin)