Fix bug.
This commit is contained in:
parent
6ce0270d0b
commit
1fb55becdf
|
@ -68,6 +68,9 @@ class CalendarsController < ApplicationController
|
||||||
subpartid = params[:subpart_id]
|
subpartid = params[:subpart_id]
|
||||||
page = Page.where(page_id: subpartid).first
|
page = Page.where(page_id: subpartid).first
|
||||||
calendar_types = page.categories
|
calendar_types = page.categories
|
||||||
|
if calendar_types.include?('all')
|
||||||
|
calendar_types = []
|
||||||
|
end
|
||||||
else
|
else
|
||||||
calendar_types = []
|
calendar_types = []
|
||||||
end
|
end
|
||||||
|
|
|
@ -9,6 +9,7 @@ en:
|
||||||
save: Save
|
save: Save
|
||||||
select_calendar: "Select Calendar"
|
select_calendar: "Select Calendar"
|
||||||
categories: Categories
|
categories: Categories
|
||||||
|
categories_management: Categories Management
|
||||||
new_category: New Category
|
new_category: New Category
|
||||||
all_day: All Day
|
all_day: All Day
|
||||||
note: Note
|
note: Note
|
||||||
|
|
|
@ -8,6 +8,7 @@ zh_tw:
|
||||||
save: 儲存
|
save: 儲存
|
||||||
select_calendar: 選取行事曆
|
select_calendar: 選取行事曆
|
||||||
categories: 類別
|
categories: 類別
|
||||||
|
categories_management: 類別管理
|
||||||
all_day: 全天
|
all_day: 全天
|
||||||
note: 註記
|
note: 註記
|
||||||
repeats: 重複
|
repeats: 重複
|
||||||
|
|
|
@ -7,7 +7,7 @@ module Calendar
|
||||||
widget_methods ["widget"]
|
widget_methods ["widget"]
|
||||||
widget_settings [{"override_category_with"=>"calendar_type","multiselect"=>true,"display_field"=>"title"}]
|
widget_settings [{"override_category_with"=>"calendar_type","multiselect"=>true,"display_field"=>"title"}]
|
||||||
taggable "Event"
|
taggable "Event"
|
||||||
categorizable
|
# categorizable
|
||||||
authorizable
|
authorizable
|
||||||
frontend_enabled
|
frontend_enabled
|
||||||
data_count 1..10
|
data_count 1..10
|
||||||
|
@ -23,7 +23,7 @@ module Calendar
|
||||||
:priority=>1,
|
:priority=>1,
|
||||||
:active_for_action=>{'admin/calendars'=>'index'},
|
:active_for_action=>{'admin/calendars'=>'index'},
|
||||||
:available_for => 'users'
|
:available_for => 'users'
|
||||||
context_link 'new_',
|
context_link 'calendar.categories_management',
|
||||||
:link_path=>"admin_calendar_types_path" ,
|
:link_path=>"admin_calendar_types_path" ,
|
||||||
:priority=>2,
|
:priority=>2,
|
||||||
:active_for_action=>{'admin/calendar_types'=>'index'},
|
:active_for_action=>{'admin/calendar_types'=>'index'},
|
||||||
|
|
Loading…
Reference in New Issue