add i18n variable. fix web_links for disable category
This commit is contained in:
1 parent
ca2c056a07
commit
85d6bbe1c9
6 files changed
+10
-18
No files matched your search
+1
-2
@@ -144,8 +144,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
|
||||
|
||||
respond_to do |format|
|
||||
if @bulletin.save
|
||||
# format.html { redirect_to(panel_announcement_back_end_bulletin_url(@bulletin), :notice => t('announcement.create_bulletin_success')) }
|
||||
format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('announcement.create_bulletin_success')) }
|
||||
format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('bulletin.create_bulletin_success')) }
|
||||
format.xml { render :xml => @bulletin, :status => :created, :location => @bulletin }
|
||||
format.js
|
||||
else
|
||||
|
||||
@@ -79,7 +79,8 @@ zh_tw:
|
||||
fact_check: 公告審核
|
||||
delete: 刪除
|
||||
edit: 編輯
|
||||
|
||||
update_bulletin_success: 成功更新公告
|
||||
create_bulletin_success: 成功新增公告
|
||||
# action: 行動
|
||||
# add_language: 新增語言
|
||||
# admin: 管理
|
||||
|
||||
Vendored
+1
-2
@@ -148,8 +148,7 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
|
||||
|
||||
respond_to do |format|
|
||||
if @news_bulletin.save
|
||||
# format.html { redirect_to(panel_news_back_end_news_bulletin_url(@news_bulletin), :notice => t('news.create_news_bulletin_success')) }
|
||||
format.html { redirect_to(panel_news_back_end_news_bulletins_url, :notice => t('news.create_news_bulletin_success')) }
|
||||
format.html { redirect_to(panel_news_back_end_news_bulletins_url, :notice => t('news_bulletin.create_news_bulletin_success')) }
|
||||
format.xml { render :xml => @news_bulletin, :status => :created, :location => @news_bulletin }
|
||||
format.js
|
||||
else
|
||||
|
||||
+2
-1
@@ -77,7 +77,8 @@ zh_tw:
|
||||
edit: 編輯
|
||||
update_success: 分類更新成功
|
||||
update_failed: 分類更新失敗
|
||||
|
||||
create_news_bulletin_success: 新增新聞成功
|
||||
update_success: 更新新聞成功
|
||||
|
||||
# action: 行動
|
||||
# add_language: 新增語言
|
||||
|
||||
+4
-8
@@ -3,6 +3,9 @@ class Panel::WebResource::BackEnd::WebLinksController < OrbitBackendController
|
||||
before_filter :authenticate_user!
|
||||
# before_filter :for_app_manager,:except => [:index,:show]
|
||||
before_filter :for_app_sub_manager,:except => [:index]
|
||||
before_filter :only => [ :new,:edit,:update] do |controller|
|
||||
controller.get_categorys('WebLinkCategory')
|
||||
end
|
||||
|
||||
def index
|
||||
|
||||
@@ -43,8 +46,6 @@ class Panel::WebResource::BackEnd::WebLinksController < OrbitBackendController
|
||||
# GET /web_links/1.xml
|
||||
def show
|
||||
@web_link = WebLink.find(params[:id])
|
||||
# get_categorys
|
||||
|
||||
respond_to do |format|
|
||||
format.html # show.html.erb
|
||||
format.xml { render :xml => @web_link }
|
||||
@@ -54,12 +55,8 @@ class Panel::WebResource::BackEnd::WebLinksController < OrbitBackendController
|
||||
# GET /web_links/new
|
||||
# GET /web_links/new.xml
|
||||
def new
|
||||
|
||||
@web_link = WebLink.new
|
||||
|
||||
get_categorys
|
||||
|
||||
get_tags
|
||||
get_tags
|
||||
|
||||
respond_to do |format|
|
||||
format.html # new.html.erb
|
||||
@@ -70,7 +67,6 @@ class Panel::WebResource::BackEnd::WebLinksController < OrbitBackendController
|
||||
# GET /web_links/1/edit
|
||||
def edit
|
||||
@web_link = WebLink.find(params[:id])
|
||||
get_categorys
|
||||
get_tags
|
||||
end
|
||||
|
||||
|
||||
Reference in new issue
Block a user