- Time to next: <%= ad_image.time_to_next %>
- Intro: <%= ad_image.picture_intro %>
- Out Link <%= link_to ad_image.out_link %> by <%= ad_image.link_open %>
-
-
diff --git a/app/views/admin/ad_banners/_ad_image_form.html.erb b/app/views/admin/ad_banners/_ad_image_form.html.erb
deleted file mode 100644
index 3a153d47..00000000
--- a/app/views/admin/ad_banners/_ad_image_form.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-Time: <%= f.text_field :time_to_next ,:class=> 'ad_time'%>
-Link:<%= f.text_field :out_link ,:class=> 'ad_out_link'%>
-Open Type <%= f.select :link_open ,AdImage::LINK_OPEN_TYPES %>
-
-<%= f.hidden_field :to_save %>
\ No newline at end of file
diff --git a/app/views/admin/ad_banners/_ad_image_show.html.erb b/app/views/admin/ad_banners/_ad_image_show.html.erb
deleted file mode 100644
index e724a47f..00000000
--- a/app/views/admin/ad_banners/_ad_image_show.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-
- <%= image_tag ad_image.file %>
-
- Time to next: <%= ad_image.time_to_next %>
- Intro: <%= ad_image.picture_intro %>
- Out Link <%= link_to ad_image.out_link %> by <%= ad_image.link_open %>
-
<% end %>
\ No newline at end of file
diff --git a/app/views/admin/ad_banners/_preview_block.html.erb b/app/views/admin/ad_banners/_preview_block.html.erb
new file mode 100644
index 00000000..4e8432b6
--- /dev/null
+++ b/app/views/admin/ad_banners/_preview_block.html.erb
@@ -0,0 +1,29 @@
+<% if ad_banner -%>
+<%= link_to 'Preview',"#slideshow-#{ad_banner.title.dehumanize}",:class=>"btn btn-primary btn-large",:data=>{:toggle=>'modal'} %>
+
+
\ No newline at end of file
diff --git a/app/views/admin/ad_banners/new.html.erb b/app/views/admin/ad_banners/new.html.erb
index 31d182b7..e69de29b 100644
--- a/app/views/admin/ad_banners/new.html.erb
+++ b/app/views/admin/ad_banners/new.html.erb
@@ -1,13 +0,0 @@
-
\ No newline at end of file
diff --git a/app/views/admin/tags/index.html.erb b/app/views/admin/tags/index.html.erb
index 5e757313..cca4b6af 100644
--- a/app/views/admin/tags/index.html.erb
+++ b/app/views/admin/tags/index.html.erb
@@ -1,6 +1,16 @@
-
-
-
\ No newline at end of file
diff --git a/app/views/layouts/_orbit_bar.html.erb b/app/views/layouts/_orbit_bar.html.erb
index ede8262f..e7bcdb1a 100644
--- a/app/views/layouts/_orbit_bar.html.erb
+++ b/app/views/layouts/_orbit_bar.html.erb
@@ -15,6 +15,7 @@
'
- case part.kind
- when 'text'
- ret << part.i18n_variable[I18n.locale] rescue ''
- when 'module_widget'
- if part[:category]
- ret << ""
- else
- ret << ""
- end
- when 'public_r_tag'
- ret << ""
- else
- ''
+ case part.kind
+ when 'text'
+ ret << part.i18n_variable[I18n.locale] rescue ''
+ when 'module_widget'
+ if part[:category]
+ ret << ""
+ else
+ ret << ""
end
- ret << '
'
- end
+ when 'public_r_tag'
+ ret << ""
+ public_r_tags << part.public_r_tag
+ else
+ ''
+ end if part
end
- c.define_tag 'link' do |tag|
- item = Item.first(:conditions => { :full_name => tag.attr['name'] })
- ret = ''
- ret << ""
- ret << item.i18n_variable[I18n.locale]
- ret << ""
- end
- c.define_tag 'menu' do |tag|
- home = get_homepage
- menu = page.design.layout.menu
- menu_level(home, 0, menu, true)
+ scope = "<#{content.name}"
+ content.attributes.each_pair do |key, value|
+ scope << " #{key}='#{value}'"
end
+ scope << ">#{ret}"
+ fragment = Nokogiri::HTML::DocumentFragment.new(body, scope)
+ content.swap(fragment)
end
+ public_r_tags.uniq
end
-
+
+
def self.included(base)
- base.send :helper_method, :parse_page_edit if base.respond_to? :helper_method
+ base.send :helper_method, :parse_page_edit_noko if base.respond_to? :helper_method
end
end
diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb
index 8d43c070..93ea2608 100644
--- a/lib/parsers/parser_common.rb
+++ b/lib/parsers/parser_common.rb
@@ -2,7 +2,7 @@ module ParserCommon
def menu_level(page, current, menu, edit = false)
res = ''
- if current <= menu.levels
+ if menu.levels > 0 && current <= menu.levels
if current != 0
res << "
"
item = rand(100000)
@@ -44,4 +44,66 @@ module ParserCommon
res << ""
end
+ # ad_banners
+ def parse_ad_banners(body = nil, page = nil, id = nil)
+ body.css('ad_banner').each do |banner|
+ res = ''
+ ad_banner = AdBanner.find(banner["id"]) rescue nil
+ if ad_banner
+ res << ""
+ res << "
"
+ printable_ad_images = []
+ ad_banner.ad_images.each do |ad_image|
+ if ad_image.display?
+ ad_image.weight.times do
+ printable_ad_images << ad_image
+ end
+ end
+ end
+ printable_ad_images.shuffle!
+ printable_ad_images.each do |ad_image| #TODO Need Reflact
+ res << ""
+ end
+ res << "
"
+ end
+ fragment = Nokogiri::HTML::DocumentFragment.new(body, res)
+ banner.swap(fragment)
+ end
+ end
+
+ # page_images
+ def parse_images(body, page)
+ body.css('.page_image').each do |page_image|
+ # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) }
+ # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image
+ image = page.design.images.detect{|image| image.name.eql?(File.basename(page_image['src'])) } unless image
+ if image
+ res = "'
+ end
+ fragment = Nokogiri::HTML::DocumentFragment.new(body, res)
+ page_image.swap(fragment)
+ end
+ end
+
+ # page_menu
+ def parse_menu(body, page, edit=nil)
+ page_menu = body.css('.page_menu').first
+ home = get_homepage
+ menu = page.design.layout.menu
+ fragment = Nokogiri::HTML::DocumentFragment.new(body, menu_level(home, 0, menu, edit))
+ page_menu.swap(fragment)
+ end
+
end
diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb
index 99353cc1..dfec0dd9 100644
--- a/lib/parsers/parser_front_end.rb
+++ b/lib/parsers/parser_front_end.rb
@@ -1,180 +1,77 @@
module ParserFrontEnd
- require 'radius'
include ParserCommon
+ # c.define_tag 'language_bar' do
+ # @site.in_use_locales.map{ |locale|
+ # lang = I18nVariable.first(:conditions => {:key => locale})[locale]
+ # if I18n.locale.to_s.eql?(locale)
+ # lang
+ # else
+ # "#{lang}"
+ # end
+ # }.join(' | ')
+ # end
+ # c.define_tag 'link' do |tag|
+ # item = Item.first(:conditions => { :full_name => tag.attr['name'] })
+ # ret = ''
+ # ret << ""
+ # ret << item.i18n_variable[I18n.locale]
+ # ret << ''
+ # end
+ # end
- def parser_context(page, attributes = {}, id = nil)
- Radius::Context.new do |c|
- c.define_tag 'snippet' do |tag|
- snippet = Snippet.first(:conditions => {:name => tag.attr['name']})
- if snippet
- snippet.content
- else
- t('nothing')
- end
- end
- c.define_tag 'language_bar' do
- @site.in_use_locales.map{ |locale|
- lang = I18nVariable.first(:conditions => {:key => locale})[locale]
- if I18n.locale.to_s.eql?(locale)
- lang
- else
- "#{lang}"
- end
- }.join(' | ')
- end
- c.define_tag 'locale' do |tag|
- case attributes[:locale]
- when 'create'
- var = I18nVariable.new(:key => (tag.attr['name'] rescue nil), :document_class => 'Text')
- @site.valid_locales.each do |locale|
- var[locale] = tag.attr[locale] rescue nil
- end
- var.save!
- res = ''
- res << "'
- when 'show'
- var = I18nVariable.find(tag.attr['id'])
- res = ''
- res << "'
- when 'destroy'
- var = I18nVariable.find(tag.attr['id'])
- var.destroy
- end
- end
- c.define_tag 'css' do |tag|
- assets = Asset.any_in(:filename => tag.attr['name'].split(',').map(&:strip))
- res = ''
- assets.each do |asset|
- res << " " if asset.data.file.content_type.eql?('text/css')
- end
- res
- end
- c.define_tag 'stylesheets' do |tag|
- res = ''
- res << ""
- res << ""
- res << ""
- res << "" if page.design.reset_css
- res << " " if page.design.default_css
- theme = page.design.themes.detect{ |d| d.id == page.theme_id }
- res << "" if theme
- res
- end
- c.define_tag 'javascripts' do |tag|
- res = ''
- res << ""
- res << ""
- res << ""
- res << ""
- res << ""
- res << ""
- res << ""
- res << ""
- res << ""
- page.design.javascripts.each do |js|
- # res << ""
- end
- res
- end
- c.define_tag 'ad_banner' do |tag|
- res = ''
- ad_banner = AdBanner.find(tag.attr["id"]) rescue nil
- if ad_banner && ad_banner.display?
- res << ""
- res << "
"
- ad_banner.ad_images.each do |ad_image|
- res << ""
- end
- res << "
"
- end
- res
- end
- c.define_tag 'image' do |tag|
- # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) }
- # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image
- image = page.design.images.detect{|image| image.name.eql?(tag.attr['name']) } unless image
- if image
- res = "'
- end
- end
- c.define_tag 'layout_part' do |tag|
- part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } rescue nil
- part.content
- end
- c.define_tag 'content' do |tag|
- ret = ''
- if (tag.attributes["main"] == "true" && !page.module_app.nil?)
- ret << ""
- else
- part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } rescue nil
- case part.kind
- when 'text'
- ret << part.i18n_variable[I18n.locale] rescue ''
- when 'module_widget'
- if part[:category]
- ret << ""
- else
- ret << ""
- end
- when 'public_r_tag'
- ret << ""
- else
- ''
- end
- end
- ret
- end
- c.define_tag 'link' do |tag|
- item = Item.first(:conditions => { :full_name => tag.attr['name'] })
- ret = ''
- ret << ""
- ret << item.i18n_variable[I18n.locale]
- ret << ''
- end
- c.define_tag 'menu' do |tag|
- home = get_homepage
- menu = page.design.layout.menu
- menu_level(home, 0, menu)
- end
+ require 'nokogiri'
+
+ def parse_page_noko(page, id = nil)
+ body = Nokogiri::HTML(page.design.layout.body)
+ parse_menu(body, page)
+ public_r_tags = parse_contents(body, page, id)
+ parse_images(body, page)
+
+ public_r_tags.each do |tag|
+ send("parse_#{tag}s", body, page,id)
end
+
+ body.to_html
end
-
- def parse_page(page, id = nil)
- if page._type == 'Page'
- layout_content = page.design.layout.content.force_encoding('UTF-8') rescue ''
- context = parser_context(page, {}, id)
- parser = Radius::Parser.new(context, :tag_prefix => 'r')
- parser.parse(parser.parse(layout_content))
+
+ # page_contents
+ def parse_contents(body, page, id)
+ public_r_tags = []
+ body.css('.page_content').each do |content|
+ ret = ''
+ if (content["main"] == "true" && !page.module_app.nil?)
+ ret << ""
+ else
+ part = page.page_parts.detect{ |p| p.name.to_s == content['name'].to_s } rescue nil
+ case part.kind
+ when 'text'
+ ret << part.i18n_variable[I18n.locale] rescue ''
+ when 'module_widget'
+ if part[:category]
+ ret << ""
+ else
+ ret << ""
+ end
+ when 'public_r_tag'
+ ret << ""
+ public_r_tags << part.public_r_tag
+ else
+ ''
+ end if part
+ end
+ scope = "<#{content.name}"
+ content.attributes.each_pair do |key, value|
+ scope << " #{key}='#{value}'"
+ end
+ scope << ">#{ret}"
+ fragment = Nokogiri::HTML::DocumentFragment.new(body, scope)
+ content.swap(fragment)
end
- end
-
- def self.included(base)
- base.send :helper_method, :parse_page if base.respond_to? :helper_method
+ public_r_tags.uniq
end
end
diff --git a/lib/parsers/parser_layout.rb b/lib/parsers/parser_layout.rb
index 4a0232c6..3379c487 100644
--- a/lib/parsers/parser_layout.rb
+++ b/lib/parsers/parser_layout.rb
@@ -1,44 +1,31 @@
module ParserLayout
- require 'radius'
- include ParserCommon
+ require 'nokogiri'
- def parse_layout_contents(layout)
- content = layout.content.force_encoding('UTF-8')
- context = parser_layout_contents(layout)
- parser = Radius::Parser.new(context, :tag_prefix => 'r')
- parser.parse(content)
- end
+ def parse_body(layout)
+ body = Nokogiri::HTML(layout.body)
- def parser_layout_contents(layout)
- Radius::Context.new do |c|
- c.define_tag 'javascripts' do |tag|
- end
- c.define_tag 'stylesheets' do |tag|
- end
- c.define_tag 'ad_banner' do |tag|
- end
- c.define_tag 'menu' do |tag|
- layout.build_menu(:levels => 0, :values => {}) unless layout.menu
- layout.menu.levels = i = tag.attr['level'].to_i
- layout.menu.values.merge!({'home' => tag.attr['home']}) if i == 1
- layout.menu.values.merge!({"id_#{i}" => tag.attr['id'], "class_#{i}" => tag.attr['class'], "li_class_#{i}" => tag.attr['li_class'], "li_incremental_#{i}" => tag.attr['li_incremental']})
- tag.expand
- end
- c.define_tag 'content' do |tag|
- layout.layout_parts.new(:name => tag.attr['name'])
- end
- c.define_tag 'image' do |tag|
- image = layout.design.images.detect{ |i| i.file_identifier.eql?(parse_html_image(tag.expand)) }
- image.update_attributes(:name => tag.attr['name'], :html_id => tag.attr['id'], :html_class => tag.attr['class']) if image
- end
+ body.css('.page_content').each do |content|
+ layout.layout_parts.build(:name => content['name'])
end
+
+ body.css('.page_menu').each do |menu|
+ layout.build_menu(:levels => 0, :values => {}) unless layout.menu
+ layout.menu.levels = i = menu['level'].to_i
+ layout.menu.values.merge!({'home' => menu['home']}) if i == 1
+ layout.menu.values.merge!({"id_#{i}" => menu['id'], "class_#{i}" => menu['class'], "li_class_#{i}" => menu['li_class'], "li_incremental_#{i}" => menu['li_incremental']})
+ end
+
end
-
- def parse_html_image(html)
- html.scan(/(?<=\)/){
- $1.gsub(' ','').scan(/(?<=src=\")(.*?)(?=\")/){
- return File.basename($1).gsub(/[\\\"]/, '')
- }
- }
+
+ def parse_body_for_images(design)
+ body = Nokogiri::HTML(design.layout.body)
+
+ body.css('.page_image').each do |page_image|
+ image = design.images.where( file: File.basename(page_image['src']))[0]
+ image.update_attributes(:name => File.basename(page_image['src']), :html_id => page_image['id'], :html_class => page_image['class']) if image
+ end
+
end
+
+
end
diff --git a/lib/tasks/noko.rake b/lib/tasks/noko.rake
new file mode 100644
index 00000000..b411fa30
--- /dev/null
+++ b/lib/tasks/noko.rake
@@ -0,0 +1,13 @@
+# encoding: utf-8
+
+namespace :nokogiri do
+ task :layout => :environment do
+ l = Design.first(:conditions => {:title => 'CCU'}).layout
+ l.layout_parts.destroy rescue nil
+ l.menu.destroy rescue nil
+ l.design.save
+ l = Design.first(:conditions => {:title => 'CCU'}).layout
+ l.file = File.open("#{Rails.root}/lib/noko/layout.html")
+ l.design.save
+ end
+end
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
index d648e2a2..0e3894b9 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
@@ -1,5 +1,4 @@
class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendController
- layout 'new_admin'
def index
@bulletin_categorys = BulletinCategory.all
@@ -93,7 +92,7 @@ class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendCo
respond_to do |format|
if @bulletin_category.update_attributes(params[:bulletin_category])
# format.html { redirect_to(panel_announcement_back_end_bulletin_category_url(@bulletin_category), :notice => t('bulletin_category.update_bulletin_category_success')) }
- format.html { redirect_to(panel_announcement_back_end_bulletin_categorys_url, :notice => t('bulletin_category.update_bulletin_category_success')) }
+ # format.html { redirect_to(panel_announcement_back_end_bulletin_categorys_url, :notice => t('bulletin_category.update_bulletin_category_success')) }
# format.xml { head :ok }
format.js
else
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_files_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_files_controller.rb
new file mode 100644
index 00000000..223e2ba5
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_files_controller.rb
@@ -0,0 +1,48 @@
+class Panel::Announcement::BackEnd::BulletinFilesController < ApplicationController
+
+ layout 'new_admin'
+
+ def index
+ @bulletin_files = BulletinFile.all
+
+ respond_to do |format|
+ format.html # index.html.erb
+ # format.xml { render :xml => @bulletins }
+ format.js
+ end
+
+ end
+
+ # POST /bulletins
+ # POST /bulletins.xml
+ def create
+ @bulletin_file = BulletinFile.new(params[:bulletin_file])
+
+ respond_to do |format|
+ if @bulletin_file.save
+ format.html { redirect_to(panel_announcement_back_end_bulletins_url) }
+ format.js
+ else
+ format.html { render :action => "new" }
+ format.js { render action: "new" }
+ end
+ end
+ end
+
+ # PUT /bulletins/1
+ # PUT /bulletins/1.xml
+ def update
+ @bulletin_file = BulletinFile.find(params[:id])
+
+ respond_to do |format|
+ if @bulletin_file.update_attributes(params[:bulletin_file])
+ format.html { redirect_to(panel_announcement_back_end_bulletins_url) }
+ format.js
+ else
+ format.html { render :action => "edit" }
+ format.js { render :action => "edit" }
+ end
+ end
+ end
+
+end
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_links_controller-ƻs.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_links_controller-ƻs.rb
deleted file mode 100644
index 04a75fa6..00000000
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_links_controller-ƻs.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class Panel::Announcement::BackEnd::BulletinLinksController < ApplicationController
-
- layout 'new_admin'
-
- def index
- @bulletin_links = BulletinLink.all
-
- respond_to do |format|
- format.html # index.html.erb
- # format.xml { render :xml => @bulletins }
- format.js
- end
-
-end
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_links_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_links_controller.rb
new file mode 100644
index 00000000..59f164d9
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_links_controller.rb
@@ -0,0 +1,49 @@
+class Panel::Announcement::BackEnd::BulletinLinksController < ApplicationController
+
+ layout 'new_admin'
+
+ def index
+ @bulletin_links = BulletinLink.all
+
+ respond_to do |format|
+ format.html # index.html.erb
+ # format.xml { render :xml => @bulletins }
+ format.js
+ end
+
+ end
+
+ # POST /bulletins
+ # POST /bulletins.xml
+ def create
+ @bulletin_link = BulletinLink.new(params[:bulletin_link])
+ # @bulletin_link.bulletin_id = params[:bulletin_link][:bulletin_id]
+
+ respond_to do |format|
+ if @bulletin_link.save
+ format.html { redirect_to(panel_announcement_back_end_bulletins_url) }
+ format.js
+ else
+ format.html { render :action => "new" }
+ format.js { render action: "new" }
+ end
+ end
+ end
+
+ # PUT /bulletins/1
+ # PUT /bulletins/1.xml
+ def update
+ @bulletin_link = BulletinLink.find(params[:id])
+
+ respond_to do |format|
+ if @bulletin_link.update_attributes(params[:bulletin_link])
+ format.html { redirect_to(panel_announcement_back_end_bulletins_url) }
+ format.js
+ else
+ format.html { render :action => "edit" }
+ format.js { render :action => "edit" }
+ end
+ end
+ end
+
+end
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
index 0eda0723..e66c51a4 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
@@ -1,5 +1,4 @@
class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
- layout 'new_admin'
before_filter :authenticate_user!
before_filter :is_admin?
@@ -9,17 +8,40 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
# @bulletins = Bulletin.desc("postdate desc")
get_categorys(params[:bulletin_category_id])
get_tags
-
+
+ @filter = params[:filter]
+ new_filter = params[:new_filter]
+
+ if @filter && params[:clear]
+ @filter.delete(params[:type])
+ elsif @filter && new_filter
+ if @filter.has_key?(new_filter[:type]) && @filter[new_filter[:type]].include?(new_filter[:id].to_s)
+ @filter[new_filter[:type]].delete(new_filter[:id].to_s)
+ elsif @filter.has_key?(new_filter[:type])
+ @filter[new_filter[:type]] << new_filter[:id].to_s
+ else
+ @filter.merge!({new_filter[:type] => [new_filter[:id].to_s]})
+ end
+ elsif new_filter
+ @filter = {new_filter[:type] => [new_filter[:id].to_s]}
+ end
+
# @bulletins = Bulletin.where("bulletin_category_id" => params[:bulletin_category_id]).desc("postdate") if params[:bulletin_category_id]
# @bulletins = Bulletin.search(params[:search], params[:category_id])
# @bulletins = Bulletin.all.order_by([params[:sort], params[:direction]])
- @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.all
+ @bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered_bulletins : Bulletin.all.page(params[:page]).per(10)
@bulletin_categories = BulletinCategory.all
+ @bulletin_link = BulletinLink.new
+ @link_url = panel_announcement_back_end_bulletins_path
+
+ @bulletin_file = BulletinFile.new
+ @file_url = panel_announcement_back_end_bulletins_path
+
respond_to do |format|
format.html # index.html.erb
- format.js
+ format.js { }
format.xml { render :xml => @bulletins }
end
end
@@ -78,30 +100,58 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
# POST /bulletins
# POST /bulletins.xml
def create
- @bulletin = Bulletin.new(params[:bulletin])
- @bulletin.create_user_id = current_user.id
- @bulletin.update_user_id = current_user.id
+ if params[:bulletin_link]
+
+ @bulletin_link = BulletinLink.new(params[:bulletin_link])
- 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.xml { render :xml => @bulletin, :status => :created, :location => @bulletin }
- else
- format.html { render :action => "new" }
- format.xml { render :xml => @bulletin.errors, :status => :unprocessable_entity }
- end
- end
+ respond_to do |format|
+ if @bulletin_link.save
+ format.js { render 'create_bulletin_link' }
+ end
+ end
+
+ elsif params[:bulletin_file]
+
+ @bulletin_file = BulletinFile.new(params[:bulletin_file])
+
+ respond_to do |format|
+ if @bulletin_file.save
+ format.js { render 'create_bulletin_file' }
+ end
+ end
+
+ else
+
+ @bulletin = Bulletin.new(params[:bulletin])
+
+ @bulletin.create_user_id = current_user.id
+ @bulletin.update_user_id = current_user.id
+
+ 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.xml { render :xml => @bulletin, :status => :created, :location => @bulletin }
+ format.js
+ else
+ format.html { render :action => "new" }
+ format.xml { render :xml => @bulletin.errors, :status => :unprocessable_entity }
+ end
+ end
+
+ end
+
end
def link_quick_add
# debugger
-
- @bulletin = Bulletin.find(params[:bulletin_id])
-
+
+ @bulletin_link = BulletinLink.new
@link_url = panel_announcement_back_end_bulletins_path
+ @bulletin_link.bulletin_id = params[:bulletin_id]
+
respond_to do |format|
format.js
end
@@ -110,10 +160,13 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
def link_quick_edit
# debugger
+ @bulletin_link = BulletinLink.find(params[:bulletin_id])
- @bulletin = Bulletin.find(params[:bulletin_id])
+ @link_url = panel_announcement_back_end_bulletin_path(@bulletin_link)
- @link_url = panel_announcement_back_end_bulletin_path(@bulletin)
+ # @bulletin = Bulletin.find(params[:bulletin_id])
+
+ # @link_url = panel_announcement_back_end_bulletin_path(@bulletin)
respond_to do |format|
format.js
@@ -121,31 +174,88 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
end
+ def file_quick_add
+ # debugger
+
+ @bulletin_file = BulletinFile.new
+ @file_url = panel_announcement_back_end_bulletins_path
+
+ @bulletin_file.bulletin_id = params[:bulletin_id]
+
+ respond_to do |format|
+ format.js
+ end
+
+ end
+
+ def file_quick_edit
+ # debugger
+ @bulletin_file = BulletinFile.find(params[:bulletin_id])
+
+ @file_url = panel_announcement_back_end_bulletin_path(@bulletin_file)
+
+ respond_to do |format|
+ format.js
+ end
+ end
+
# PUT /bulletins/1
# PUT /bulletins/1.xml
def update
- @bulletin = Bulletin.find(params[:id])
- @bulletin.update_user_id = current_user.id
-
- # @bulletin.image.clear if params[:bulletin][:image_del] == '1'
- # if params[:bulletin][:image_del] == '1'
- # @bulletin.remove_image!
- # @bulletin.image_del = nil
- # params[:bulletin][:image_del] = nil
- # end
+ if params[:bulletin_link]
+
+ @bulletin_link = BulletinLink.find(params[:id])
+
+ @link_url = panel_announcement_back_end_bulletin_path(@bulletin_link)
- respond_to do |format|
- if @bulletin.update_attributes(params[:bulletin]) && @bulletin.save
- # format.html { redirect_to(panel_announcement_back_end_bulletin_url(@bulletin), :notice => t('bulletin.update_bulletin_success')) }
- format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('bulletin.update_bulletin_success')) }
- format.js { render 'toggle_enable' }
- format.xml { head :ok }
- else
- format.html { render :action => "edit" }
- format.xml { render :xml => @bulletin.errors, :status => :unprocessable_entity }
- end
+ respond_to do |format|
+ if @bulletin_link.update_attributes(params[:bulletin_link])
+ # format.html { redirect_to(panel_announcement_back_end_bulletins_url) }
+ format.js { render 'update_bulletin_link' }
+ end
+ end
+
+ elsif params[:bulletin_file]
+
+ @bulletin_file = BulletinFile.find(params[:id])
+
+ @file_url = panel_announcement_back_end_bulletin_path(@bulletin_file)
+
+ respond_to do |format|
+ if @bulletin_file.update_attributes(params[:bulletin_file])
+ # format.html { redirect_to(panel_announcement_back_end_bulletins_url) }
+ format.js { render 'update_bulletin_file' }
+ end
+ end
+
+ else
+
+ @bulletin = Bulletin.find(params[:id])
+
+ @bulletin.update_user_id = current_user.id
+
+ # @bulletin.image.clear if params[:bulletin][:image_del] == '1'
+ # if params[:bulletin][:image_del] == '1'
+ # @bulletin.remove_image!
+ # @bulletin.image_del = nil
+ # params[:bulletin][:image_del] = nil
+ # end
+
+ respond_to do |format|
+ if @bulletin.update_attributes(params[:bulletin]) && @bulletin.save
+ # format.html { redirect_to(panel_announcement_back_end_bulletin_url(@bulletin), :notice => t('bulletin.update_bulletin_success')) }
+ format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('bulletin.update_bulletin_success')) }
+ format.js { render 'toggle_enable' }
+ format.xml { head :ok }
+ else
+ format.html { render :action => "edit" }
+ format.xml { render :xml => @bulletin.errors, :status => :unprocessable_entity }
+ end
+ end
+
end
+
end
# DELETE /bulletins/1
@@ -172,6 +282,21 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
# end
+
+ def load_quick_edit
+ @bulletin = Bulletin.find(params[:id])
+ @type = params[:type]
+ @bulletin_categories = BulletinCategory.all
+ get_tags
+ end
+
+ def delete
+ if params[:to_delete]
+ bulletins = Bulletin.any_in(:_id => params[:to_delete]).delete_all
+ end
+ redirect_to panel_announcement_back_end_bulletins_url(:filter => params[:filter], :direction => params[:direction], :sort => params[:sort])
+ end
+
protected
@@ -184,21 +309,16 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
end
end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'announcement'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id}).order_by(I18n.locale, :asc)
- end
-
def get_tags
module_app = ModuleApp.first(:conditions => {:key => 'announcement'})
@tags = Tag.all(:conditions => {:module_app_id => module_app.id}).order_by(I18n.locale, :asc)
end
- def get_sorted_bulletins
+ def get_sorted_and_filtered_bulletins
bulletins = Bulletin.all
case params[:sort]
when 'postdate', 'deadline'
- bulletins.order_by([params[:sort], params[:direction]])
+ bulletins = bulletins.order_by([params[:sort], params[:direction]])
when 'category'
category_ids = bulletins.distinct(:bulletin_category_id)
categories = BulletinCategory.find(category_ids) rescue nil
@@ -207,36 +327,66 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
categories.each { |category| h[category.i18n_variable[I18n.locale]] = category.id }
sorted = params[:direction].eql?('asc') ? h.sort : h.sort.reverse!
sorted_categorys = sorted.collect {|a| bulletins.where(:bulletin_category_id => a[1]).entries }
- sorted_categorys.flatten
- else
- nil
+ bulletins = sorted_categorys.flatten!
end
when 'title'
- h = Hash.new
- bulletins.each { |bulletin| h[bulletin.title[I18n.locale]] = bulletin }
+ h = Array.new
+ bulletins.each { |bulletin| h << [bulletin.title[I18n.locale].downcase, bulletin] }
sorted = params[:direction].eql?('asc') ? h.sort : h.sort.reverse!
- sorted.collect {|a| a[1] }
+ bulletins = sorted.collect {|a| a[1] }
when 'status'
- bulletins.order_by(:is_top, params[:direction]).order_by(:is_hot, params[:direction]).order_by(:is_hidden, params[:direction])
+ bulletins = bulletins.order_by(:is_top, params[:direction]).order_by(:is_hot, params[:direction]).order_by(:is_hidden, params[:direction])
when 'update_user_id'
user_ids = bulletins.distinct(:update_user_id)
users = User.find(user_ids) rescue nil
if users
- h = Hash.new
- users.each { |user| h[user.name] = user.id }
+ h = Array.new
+ users.each { |user| h << [user.name, user.id] }
sorted = params[:direction].eql?('asc') ? h.sort : h.sort.reverse!
sorted_users = sorted.collect {|a| bulletins.where(:update_user_id => a[1]).entries }
- sorted_users.flatten
- else
- nil
+ bulletins = sorted_users.flatten
end
when 'tags'
a = Array.new
AnnouncementTag.all.order_by(I18n.locale, params[:direction]).each { |tag| a << tag.bulletins }
a.flatten!
- a.uniq
+ a.uniq!
+ tmp = Array.new
+ bulletins.where(:tag_ids => []).each { |bulletin| tmp << [bulletin.title[I18n.locale].downcase, bulletin] }
+ sorted = params[:direction].eql?('asc') ? tmp.sort : tmp.sort.reverse!
+ sorted_titles = sorted.collect {|a| a[1] }
+ a = params[:direction].eql?('asc') ? (sorted_titles + a) : (a + sorted_titles)
+ bulletins = a.flatten
end
+ if @filter
+ @filter.each do |key, value|
+ case key
+ when 'status'
+ a = Array.new
+ bulletins.each do |bulletin|
+ value.each do |v|
+ a << bulletin if bulletin[v]
+ end
+ end
+ bulletins = a
+ when 'categories'
+ a = Array.new
+ bulletins.each do |bulletin|
+ a << bulletin if value.include?(bulletin.bulletin_category.id.to_s)
+ end
+ bulletins = a
+ when 'tags'
+ a = Array.new
+ bulletins.each do |bulletin|
+ bulletin.tags.each do |tag|
+ a << bulletin if value.include?(tag.id.to_s)
+ end
+ end
+ bulletins = a
+ end if value.size > 0
+ end
+ end
+ Kaminari.paginate_array(bulletins).page(params[:page]).per(10)
end
-
end
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb
index c47e91fb..606225e9 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb
@@ -2,7 +2,6 @@ class Panel::Announcement::BackEnd::FactChecksController < OrbitBackendControll
before_filter :authenticate_user!
include AdminHelper
# layout 'admin'
- layout 'new_admin'
def setting
@bulletin_categorys = BulletinCategory.all
@@ -18,7 +17,7 @@ class Panel::Announcement::BackEnd::FactChecksController < OrbitBackendControll
else
first_category = @bulletin_categorys.first
end
- preload_object_auth = first_category.object_auths.where(title: 'fact_check') || (first_category.object_auths.create :title=> 'fact_check')
+ preload_object_auth = first_category.object_auths.where(title: 'fact_check').empty?? (first_category.object_auths.create! :title=> 'fact_check') : first_category.object_auths.where(title: 'fact_check')
@users_array = preload_object_auth.first.privilege_users rescue []
respond_to do |format|
format.html
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
index ff3cbdc9..3ba0e666 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
@@ -2,7 +2,7 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
def initialize
super
- @app_title = NewBlog::MOUDLEAPP_TITLE
+ @app_title = 'announcement'
end
# GET /bulletins
@@ -12,9 +12,9 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
date_now = Time.now
if params[:category_id]
- @bulletins = Bulletin.where(:bulletin_category_id => params[:category_id]).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10)
+ @bulletins = Bulletin.can_display.where(:bulletin_category_id => params[:category_id]).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10)
else
- @bulletins = Bulletin.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10)
+ @bulletins = Bulletin.can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10)
end
get_categorys
@@ -23,7 +23,7 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
end
def show
- @bulletin = Bulletin.find(params[:id])
+ @bulletin = Bulletin.can_display.where.where(_id: params[:id])
get_categorys
end
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
index 60aad3d9..96277c5e 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
@@ -2,7 +2,7 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
def initialize
super
- @app_title = NewBlog::MOUDLEAPP_TITLE
+ @app_title = 'announcement'
end
# GET /bulletins
@@ -14,9 +14,9 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
# @bulletin_categorys = BulletinCategory.first;
# @bulletins = Bulletin.widget_datas(@bulletin_categorys.id).limit(9)
if params[:category_id]
- @bulletins = Bulletin.where(:bulletin_category_id => params[:category_id]).widget_datas.limit(9)
+ @bulletins = Bulletin.can_display.where(:bulletin_category_id => params[:category_id]).widget_datas.limit(9)
else
- @bulletins = Bulletin.widget_datas.limit(9)
+ @bulletins = Bulletin.can_display.widget_datas.limit(9)
end
get_categorys
@@ -26,14 +26,14 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
def bulletins_and_web_links
@tags = AnnouncementTag.all
@selected_tag = AnnouncementTag.find(params[:id]) rescue @tags[0]
- @bulletins = @selected_tag.get_visible_bulletins.page(params[:page]).per(5) rescue nil
+ @bulletins = @selected_tag.get_visible_bulletins.can_display.page(params[:page]).per(5) rescue nil
@web_links = WebResourceTag.first(:conditions => {:en => @selected_tag[:en]}).get_visible_links.page(params[:page]).per(5) rescue nil
render :layout => 'module_widget'
end
def reload_bulletins
@selected_tag = AnnouncementTag.find(params[:tag_id])
- @bulletins = @selected_tag.get_visible_bulletins.page(params[:page]).per(5) rescue nil
+ @bulletins = @selected_tag.get_visible_bulletins.can_display.page(params[:page]).per(5) rescue nil
end
def reload_web_links
diff --git a/vendor/built_in_modules/announcement/app/models/bulletin - %BDƻs.rb b/vendor/built_in_modules/announcement/app/models/bulletin - %BDƻs.rb
deleted file mode 100644
index c65e65f7..00000000
--- a/vendor/built_in_modules/announcement/app/models/bulletin - %BDƻs.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-# encoding: utf-8
-
-class Bulletin
- include Mongoid::Document
- include Mongoid::Timestamps
- include Mongoid::MultiParameterAttributes
-
- # field :category_id, :type => Integer
- field :title
- # has_one :title_variable, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
- # has_one :subtitle_variable, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
- # has_one :text_variable, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
- field :subtitle
- field :text
- field :postdate , :type => Date
- field :deadline , :type => Date
- # field :url
- field :create_user_id
- field :update_user_id
-
- field :is_top, :type => Boolean, :default => false
-
- mount_uploader :image, ImageUploader
-
- belongs_to :bulletin_category
-
- embeds_many :bulletin_links, :cascade_callbacks => true
- embeds_many :bulletin_files, :cascade_callbacks => true
-
- # has_many :bulletin_files, :autosave => true, :dependent => :destroy
-
- accepts_nested_attributes_for :bulletin_files, :allow_destroy => true
- accepts_nested_attributes_for :bulletin_links, :allow_destroy => true
-
- # validates_presence_of :title_variable
- validates_presence_of :title
-
- after_save :save_bulletin_links
- after_save :save_bulletin_files
-
-
- def self.search( search = nil, category_id = nil )
-
- if category_id.to_s.size > 0 and search.to_s.size > 0
-
- key = /#{search}/
-
- find(:all, :conditions => {title: key, bulletin_category_id: category_id}).desc( :is_top, :postdate )
-
- elsif category_id.to_s.size > 0 and search.to_s.size < 1
-
- find(:all, :conditions => {bulletin_category_id: category_id}).desc( :is_top, :postdate )
-
- elsif search.to_s.size > 0 and category_id.to_s.size < 1
-
- key = /#{search}/
-
- find(:all, :conditions => {title: key}).desc( :is_top, :postdate )
- else
-
- find(:all).desc( :is_top, :postdate)
-
- end
-
- end
-
-
- def self.widget_datas
-
- date_now = Time.now
-
- # find(:all, :conditions => {:postdate => {"$lte" => Date.today}, deadline: nil} ).desc( :is_top, :postdate)
- # where( :postdate.lte => date_now ).where( :deadline => nil ).desc(:is_top, :postdate)
- # any_of({ :title => "test" },{:deadline => nil, :title => "123"})
- any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).limit(5)
-
-
- end
-
-
- def is_top?
- self.is_top
- end
-
- def save_bulletin_links
- self.bulletin_links.each do |t|
- if t.should_destroy
- t.destroy
- end
- end
- end
-
- def save_bulletin_files
- self.bulletin_files.each do |t|
- if t.should_destroy
- t.destroy
- end
- end
- end
-
-end
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/models/bulletin - ƻs.rb b/vendor/built_in_modules/announcement/app/models/bulletin - ƻs.rb
deleted file mode 100644
index c65e65f7..00000000
--- a/vendor/built_in_modules/announcement/app/models/bulletin - ƻs.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-# encoding: utf-8
-
-class Bulletin
- include Mongoid::Document
- include Mongoid::Timestamps
- include Mongoid::MultiParameterAttributes
-
- # field :category_id, :type => Integer
- field :title
- # has_one :title_variable, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
- # has_one :subtitle_variable, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
- # has_one :text_variable, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
- field :subtitle
- field :text
- field :postdate , :type => Date
- field :deadline , :type => Date
- # field :url
- field :create_user_id
- field :update_user_id
-
- field :is_top, :type => Boolean, :default => false
-
- mount_uploader :image, ImageUploader
-
- belongs_to :bulletin_category
-
- embeds_many :bulletin_links, :cascade_callbacks => true
- embeds_many :bulletin_files, :cascade_callbacks => true
-
- # has_many :bulletin_files, :autosave => true, :dependent => :destroy
-
- accepts_nested_attributes_for :bulletin_files, :allow_destroy => true
- accepts_nested_attributes_for :bulletin_links, :allow_destroy => true
-
- # validates_presence_of :title_variable
- validates_presence_of :title
-
- after_save :save_bulletin_links
- after_save :save_bulletin_files
-
-
- def self.search( search = nil, category_id = nil )
-
- if category_id.to_s.size > 0 and search.to_s.size > 0
-
- key = /#{search}/
-
- find(:all, :conditions => {title: key, bulletin_category_id: category_id}).desc( :is_top, :postdate )
-
- elsif category_id.to_s.size > 0 and search.to_s.size < 1
-
- find(:all, :conditions => {bulletin_category_id: category_id}).desc( :is_top, :postdate )
-
- elsif search.to_s.size > 0 and category_id.to_s.size < 1
-
- key = /#{search}/
-
- find(:all, :conditions => {title: key}).desc( :is_top, :postdate )
- else
-
- find(:all).desc( :is_top, :postdate)
-
- end
-
- end
-
-
- def self.widget_datas
-
- date_now = Time.now
-
- # find(:all, :conditions => {:postdate => {"$lte" => Date.today}, deadline: nil} ).desc( :is_top, :postdate)
- # where( :postdate.lte => date_now ).where( :deadline => nil ).desc(:is_top, :postdate)
- # any_of({ :title => "test" },{:deadline => nil, :title => "123"})
- any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).limit(5)
-
-
- end
-
-
- def is_top?
- self.is_top
- end
-
- def save_bulletin_links
- self.bulletin_links.each do |t|
- if t.should_destroy
- t.destroy
- end
- end
- end
-
- def save_bulletin_files
- self.bulletin_files.each do |t|
- if t.should_destroy
- t.destroy
- end
- end
- end
-
-end
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb
index d1b7f3c5..4808b3a9 100644
--- a/vendor/built_in_modules/announcement/app/models/bulletin.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb
@@ -19,12 +19,14 @@ class Bulletin
field :is_top, :type => Boolean, :default => false
field :is_hot, :type => Boolean, :default => false
field :is_hidden, :type => Boolean, :default => false
- field :is_checked, :type => Boolean, :default => false
+ field :is_checked, :type => Boolean, :default => nil
field :not_checked_reason
field :public, :type => Boolean, :default => true
+ scope :can_display,where(is_checked: true)
+
mount_uploader :image, ImageUploader
belongs_to :bulletin_category
@@ -47,28 +49,17 @@ class Bulletin
def self.search( search = nil, category_id = nil )
-
- if category_id.to_s.size > 0 and search.to_s.size > 0
-
+ if category_id.to_s.size > 0 and search.to_s.size > 0
key = /#{search}/
-
- find(:all, :conditions => {title: key, bulletin_category_id: category_id}).desc( :is_top, :postdate )
-
- elsif category_id.to_s.size > 0 and search.to_s.size < 1
-
- find(:all, :conditions => {bulletin_category_id: category_id}).desc( :is_top, :postdate )
-
- elsif search.to_s.size > 0 and category_id.to_s.size < 1
-
+ find(:all, :conditions => {title: key, bulletin_category_id: category_id}).desc( :is_top, :postdate )
+ elsif category_id.to_s.size > 0 and search.to_s.size < 1
+ find(:all, :conditions => {bulletin_category_id: category_id}).desc( :is_top, :postdate )
+ elsif search.to_s.size > 0 and category_id.to_s.size < 1
key = /#{search}/
-
- find(:all, :conditions => {title: key}).desc( :is_top, :postdate )
- else
-
- find(:all).desc( :is_top, :postdate)
-
- end
-
+ find(:all, :conditions => {title: key}).desc( :is_top, :postdate )
+ else
+ find(:all).desc( :is_top, :postdate)
+ end
end
@@ -87,7 +78,22 @@ class Bulletin
end
end
-
+
+ def status
+ case self.is_checked
+ when nil
+ I18n.t('announcement.bulletin.fact_check_pending')
+ when true
+ I18n.t('announcement.bulletin.fact_check_pass')
+ when false
+ I18n.t('announcement.bulletin.fact_check_not_pass')
+ end
+ end
+
+ def is_expired?
+ Date.today > self.deadline ? true : false rescue false
+ #some dates might sat as nil so rescue false
+ end
def is_top?
self.is_top
@@ -101,6 +107,15 @@ class Bulletin
self.is_hidden
end
+ def is_checked?
+ self.is_checked
+ end
+
+ def is_check_rejected?
+ self.is_checked == false
+ end
+
+
def save_bulletin_links
self.bulletin_links.each do |t|
if t.should_destroy
diff --git a/vendor/built_in_modules/announcement/app/models/bulletin_file.rb b/vendor/built_in_modules/announcement/app/models/bulletin_file.rb
index 05894515..c4d60b9b 100644
--- a/vendor/built_in_modules/announcement/app/models/bulletin_file.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin_file.rb
@@ -16,6 +16,15 @@ class BulletinFile
belongs_to :bulletin
# embedded_in :bulletin
+ before_save :set_key
+
+ def filetitle
+ @filetitle ||= I18nVariable.first(:conditions => {:key => 'filetitle', :language_value_id => self.id, :language_value_type => self.class}) rescue nil
+ end
+
+ def description
+ @description ||= I18nVariable.first(:conditions => {:key => 'description', :language_value_id => self.id, :language_value_type => self.class}) rescue nil
+ end
protected
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
index bf02b054..7f1b5626 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
@@ -5,7 +5,6 @@
-
-<%= render :partial => 'quick_edit', :locals => {:bulletin => bulletin} %>
-
-<% content_for :page_specific_javascript do %>
-
-<% end %>
\ No newline at end of file
+
+