Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Spen
|
fa1d7bfa54 |
No files matched your search
@@ -21,4 +21,3 @@ uploads/**/*
|
||||
|
||||
.sass-cache/*
|
||||
*.supported
|
||||
mongoid.yml
|
||||
@@ -1,8 +1,6 @@
|
||||
source 'http://rubygems.org'
|
||||
gem 'rails', "~> 3.2.9"
|
||||
|
||||
gem 'savon', '~> 2.2.0'
|
||||
|
||||
gem "brakeman"
|
||||
gem 'mime-types'
|
||||
|
||||
@@ -48,14 +46,14 @@ gem 'sinatra'
|
||||
gem 'sprockets'
|
||||
gem 'social-share-button'
|
||||
|
||||
gem 'tinymce-rails', '3.5.8.3'
|
||||
gem 'tinymce-rails'
|
||||
gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux")
|
||||
gem 'libv8', '~> 3.11.8' if RUBY_PLATFORM.downcase.include?("linux")
|
||||
gem 'mongoid-encryptor', :require => 'mongoid/encryptor'
|
||||
gem 'rb-readline','~> 0.4.2' if RUBY_PLATFORM.downcase.include?("linux")
|
||||
|
||||
|
||||
gem "impressionist",'1.2.0'
|
||||
gem "impressionist", :git => 'git://github.com/charlotte-ruby/impressionist.git'
|
||||
#gem 'contacts'
|
||||
#gem 'event-calendar', :require => 'event_calendar'#, :git => 'git://github.com/elevation/event_calendar.git'
|
||||
|
||||
|
||||
+409
@@ -0,0 +1,409 @@
|
||||
GIT
|
||||
remote: git://github.com/amatsuda/kaminari.git
|
||||
revision: 2e09b5374fec33b57c6387ca7bac89ecaa60c9eb
|
||||
specs:
|
||||
kaminari (0.14.1)
|
||||
actionpack (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/charlotte-ruby/impressionist.git
|
||||
revision: 0894f6a550a33f83f4937d655e9f0774521781e4
|
||||
specs:
|
||||
impressionist (1.2.0)
|
||||
httpclient (~> 2.2)
|
||||
nokogiri (~> 1.5)
|
||||
|
||||
GEM
|
||||
remote: http://rubygems.org/
|
||||
specs:
|
||||
actionmailer (3.2.12)
|
||||
actionpack (= 3.2.12)
|
||||
mail (~> 2.4.4)
|
||||
actionpack (3.2.12)
|
||||
activemodel (= 3.2.12)
|
||||
activesupport (= 3.2.12)
|
||||
builder (~> 3.0.0)
|
||||
erubis (~> 2.7.0)
|
||||
journey (~> 1.0.4)
|
||||
rack (~> 1.4.5)
|
||||
rack-cache (~> 1.2)
|
||||
rack-test (~> 0.6.1)
|
||||
sprockets (~> 2.2.1)
|
||||
activemodel (3.2.12)
|
||||
activesupport (= 3.2.12)
|
||||
builder (~> 3.0.0)
|
||||
activerecord (3.2.12)
|
||||
activemodel (= 3.2.12)
|
||||
activesupport (= 3.2.12)
|
||||
arel (~> 3.0.2)
|
||||
tzinfo (~> 0.3.29)
|
||||
activeresource (3.2.12)
|
||||
activemodel (= 3.2.12)
|
||||
activesupport (= 3.2.12)
|
||||
activesupport (3.2.12)
|
||||
i18n (~> 0.6)
|
||||
multi_json (~> 1.0)
|
||||
arel (3.0.2)
|
||||
attr_required (0.0.5)
|
||||
bcrypt-ruby (3.0.0)
|
||||
binding_of_caller (0.7.1)
|
||||
debug_inspector (>= 0.0.1)
|
||||
bourne (1.1.2)
|
||||
mocha (= 0.10.5)
|
||||
brakeman (1.9.2)
|
||||
erubis (~> 2.6)
|
||||
fastercsv (~> 1.5)
|
||||
haml (~> 3.0)
|
||||
highline (~> 1.6)
|
||||
multi_json (~> 1.2)
|
||||
ruby2ruby (~> 2.0)
|
||||
ruby_parser (~> 3.1.1)
|
||||
sass (~> 3.0)
|
||||
terminal-table (~> 1.4)
|
||||
bson (1.8.2)
|
||||
bson_ext (1.8.2)
|
||||
bson (~> 1.8.2)
|
||||
builder (3.0.4)
|
||||
capybara (2.0.2)
|
||||
mime-types (>= 1.16)
|
||||
nokogiri (>= 1.3.3)
|
||||
rack (>= 1.0.0)
|
||||
rack-test (>= 0.5.4)
|
||||
selenium-webdriver (~> 2.0)
|
||||
xpath (~> 1.0.0)
|
||||
carrierwave (0.6.2)
|
||||
activemodel (>= 3.2.0)
|
||||
activesupport (>= 3.2.0)
|
||||
carrierwave-mongoid (0.2.2)
|
||||
carrierwave (~> 0.6.1)
|
||||
mongoid (~> 2.1)
|
||||
childprocess (0.3.8)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
chinese_pinyin (0.4.1)
|
||||
chronic (0.9.0)
|
||||
coderay (1.0.9)
|
||||
coffee-rails (3.2.2)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (~> 3.2.0)
|
||||
coffee-script (2.2.0)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.4.0)
|
||||
columnize (0.3.6)
|
||||
database_cleaner (0.9.1)
|
||||
debug_inspector (0.0.2)
|
||||
debugger (1.2.4)
|
||||
columnize (>= 0.3.1)
|
||||
debugger-linecache (~> 1.1.1)
|
||||
debugger-ruby_core_source (~> 1.1.7)
|
||||
debugger-linecache (1.1.2)
|
||||
debugger-ruby_core_source (>= 1.1.1)
|
||||
debugger-ruby_core_source (1.1.8)
|
||||
delorean (2.1.0)
|
||||
chronic
|
||||
devise (1.5.3)
|
||||
bcrypt-ruby (~> 3.0)
|
||||
orm_adapter (~> 0.0.3)
|
||||
warden (~> 1.1)
|
||||
diff-lcs (1.1.3)
|
||||
encrypted_strings (0.3.3)
|
||||
erubis (2.7.0)
|
||||
exception_notification (3.0.1)
|
||||
actionmailer (>= 3.0.4)
|
||||
execjs (1.4.0)
|
||||
multi_json (~> 1.0)
|
||||
factory_girl (4.2.0)
|
||||
activesupport (>= 3.0.0)
|
||||
factory_girl_rails (4.2.1)
|
||||
factory_girl (~> 4.2.0)
|
||||
railties (>= 3.0.0)
|
||||
faker (1.1.2)
|
||||
i18n (~> 0.5)
|
||||
fastercsv (1.5.5)
|
||||
fattr (2.2.1)
|
||||
fb_graph (2.6.4)
|
||||
httpclient (>= 2.2.0.2)
|
||||
multi_json (>= 1.3)
|
||||
rack-oauth2 (>= 0.14.4)
|
||||
tzinfo
|
||||
ffi (1.4.0)
|
||||
haml (3.1.8)
|
||||
highline (1.6.15)
|
||||
hike (1.2.1)
|
||||
httpclient (2.3.2)
|
||||
i18n (0.6.1)
|
||||
journey (1.0.4)
|
||||
jquery-rails (2.1.4)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
jquery-ui-rails (4.0.1)
|
||||
jquery-rails
|
||||
railties (>= 3.1.0)
|
||||
json (1.7.7)
|
||||
mail (2.4.4)
|
||||
i18n (>= 0.4.0)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
metaclass (0.0.1)
|
||||
method_source (0.8.1)
|
||||
mime-types (1.21)
|
||||
mini_magick (3.5.0)
|
||||
subexec (~> 0.2.1)
|
||||
mocha (0.10.5)
|
||||
metaclass (~> 0.0.1)
|
||||
mongo (1.8.2)
|
||||
bson (~> 1.8.2)
|
||||
mongo_session_store-rails3 (3.0.6)
|
||||
actionpack (>= 3.0)
|
||||
mongo
|
||||
mongoid (2.6.0)
|
||||
activemodel (~> 3.1)
|
||||
mongo (~> 1.7)
|
||||
tzinfo (~> 0.3.22)
|
||||
mongoid-encryptor (0.0.5)
|
||||
activesupport (~> 3.0)
|
||||
encrypted_strings (~> 0.3.3)
|
||||
mongoid (~> 2)
|
||||
mongoid-tree (0.7.0)
|
||||
mongoid (~> 2.0)
|
||||
multi_json (1.6.1)
|
||||
net-ldap (0.3.1)
|
||||
nokogiri (1.5.6)
|
||||
options (2.3.0)
|
||||
fattr
|
||||
orm_adapter (0.0.7)
|
||||
polyglot (0.3.3)
|
||||
pr_geohash (1.0.0)
|
||||
progress_bar (0.4.0)
|
||||
highline (~> 1.6.1)
|
||||
options (~> 2.3.0)
|
||||
pry (0.9.12)
|
||||
coderay (~> 1.0.5)
|
||||
method_source (~> 0.8)
|
||||
slop (~> 3.4)
|
||||
pry-debugger (0.2.1)
|
||||
debugger (~> 1.2.0)
|
||||
pry (~> 0.9.10)
|
||||
pry-remote (0.1.6)
|
||||
pry (~> 0.9)
|
||||
slop (~> 3.0)
|
||||
pry-stack_explorer (0.4.9)
|
||||
binding_of_caller (>= 0.7)
|
||||
pry (~> 0.9.11)
|
||||
rack (1.4.5)
|
||||
rack-cache (1.2)
|
||||
rack (>= 0.4)
|
||||
rack-gridfs (0.4.1)
|
||||
mime-types
|
||||
mongo (~> 1.2)
|
||||
rack
|
||||
rack-oauth2 (1.0.0)
|
||||
activesupport (>= 2.3)
|
||||
attr_required (>= 0.0.5)
|
||||
httpclient (>= 2.2.0.2)
|
||||
i18n
|
||||
multi_json (>= 1.3.6)
|
||||
rack (>= 1.1)
|
||||
rack-protection (1.3.2)
|
||||
rack
|
||||
rack-ssl (1.3.3)
|
||||
rack
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
radius (0.7.3)
|
||||
rails (3.2.12)
|
||||
actionmailer (= 3.2.12)
|
||||
actionpack (= 3.2.12)
|
||||
activerecord (= 3.2.12)
|
||||
activeresource (= 3.2.12)
|
||||
activesupport (= 3.2.12)
|
||||
bundler (~> 1.0)
|
||||
railties (= 3.2.12)
|
||||
railties (3.2.12)
|
||||
actionpack (= 3.2.12)
|
||||
activesupport (= 3.2.12)
|
||||
rack-ssl (~> 1.3.2)
|
||||
rake (>= 0.8.7)
|
||||
rdoc (~> 3.4)
|
||||
thor (>= 0.14.6, < 2.0)
|
||||
rake (10.0.3)
|
||||
rdoc (3.12.1)
|
||||
json (~> 1.4)
|
||||
redis (3.0.2)
|
||||
redis-namespace (1.2.1)
|
||||
redis (~> 3.0.0)
|
||||
redis-search (0.9.0)
|
||||
chinese_pinyin (>= 0.3.0)
|
||||
redis (>= 2.1.1)
|
||||
redis-namespace (>= 1.0.2)
|
||||
resque (1.23.0)
|
||||
multi_json (~> 1.0)
|
||||
redis-namespace (~> 1.0)
|
||||
sinatra (>= 0.9.2)
|
||||
vegas (~> 0.1.2)
|
||||
resque-restriction (0.3.0)
|
||||
resque (>= 1.7.0)
|
||||
resque-scheduler (2.0.0)
|
||||
redis (>= 2.0.1)
|
||||
resque (>= 1.20.0)
|
||||
rufus-scheduler
|
||||
rmmseg-cpp-huacnlee (0.2.9)
|
||||
rsolr (1.0.8)
|
||||
builder (>= 2.1.2)
|
||||
rspec (2.12.0)
|
||||
rspec-core (~> 2.12.0)
|
||||
rspec-expectations (~> 2.12.0)
|
||||
rspec-mocks (~> 2.12.0)
|
||||
rspec-core (2.12.2)
|
||||
rspec-expectations (2.12.1)
|
||||
diff-lcs (~> 1.1.3)
|
||||
rspec-mocks (2.12.2)
|
||||
rspec-rails (2.12.2)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
railties (>= 3.0)
|
||||
rspec-core (~> 2.12.0)
|
||||
rspec-expectations (~> 2.12.0)
|
||||
rspec-mocks (~> 2.12.0)
|
||||
ruby2ruby (2.0.3)
|
||||
ruby_parser (~> 3.1)
|
||||
sexp_processor (~> 4.0)
|
||||
ruby_parser (3.1.1)
|
||||
sexp_processor (~> 4.1)
|
||||
rubyzip (0.9.9)
|
||||
rufus-scheduler (2.0.17)
|
||||
tzinfo (>= 0.3.23)
|
||||
sass (3.2.5)
|
||||
sass-rails (3.2.6)
|
||||
railties (~> 3.2.0)
|
||||
sass (>= 3.1.10)
|
||||
tilt (~> 1.3)
|
||||
select2-rails (3.3.1)
|
||||
sass-rails (>= 3.2)
|
||||
thor (~> 0.14)
|
||||
selenium-webdriver (2.30.0)
|
||||
childprocess (>= 0.2.5)
|
||||
multi_json (~> 1.0)
|
||||
rubyzip
|
||||
websocket (~> 1.0.4)
|
||||
sexp_processor (4.1.5)
|
||||
shoulda-matchers (1.4.2)
|
||||
activesupport (>= 3.0.0)
|
||||
bourne (~> 1.1.2)
|
||||
simplecov (0.7.1)
|
||||
multi_json (~> 1.0)
|
||||
simplecov-html (~> 0.7.1)
|
||||
simplecov-html (0.7.1)
|
||||
sinatra (1.3.4)
|
||||
rack (~> 1.4)
|
||||
rack-protection (~> 1.3)
|
||||
tilt (~> 1.3, >= 1.3.3)
|
||||
slop (3.4.3)
|
||||
social-share-button (0.1.1)
|
||||
spork (0.9.2)
|
||||
sprockets (2.2.2)
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
subexec (0.2.2)
|
||||
sunspot (1.3.3)
|
||||
pr_geohash (~> 1.0)
|
||||
rsolr (~> 1.0.7)
|
||||
sunspot-rails-tester (0.0.4)
|
||||
sunspot_rails (~> 1.2)
|
||||
sunspot_mongo (1.0.1)
|
||||
sunspot_rails
|
||||
sunspot_rails (1.3.3)
|
||||
nokogiri
|
||||
sunspot (= 1.3.3)
|
||||
sunspot_solr (1.3.3)
|
||||
syslog-logger (1.6.8)
|
||||
terminal-table (1.4.5)
|
||||
thor (0.17.0)
|
||||
tilt (1.3.3)
|
||||
tinymce-rails (3.5.8)
|
||||
railties (>= 3.1.1)
|
||||
treetop (1.4.12)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
tzinfo (0.3.35)
|
||||
uglifier (1.3.0)
|
||||
execjs (>= 0.3.0)
|
||||
multi_json (~> 1.0, >= 1.0.2)
|
||||
vegas (0.1.11)
|
||||
rack (>= 1.0.0)
|
||||
warden (1.2.1)
|
||||
rack (>= 1.0)
|
||||
watchr (0.7)
|
||||
websocket (1.0.7)
|
||||
xpath (1.0.0)
|
||||
nokogiri (~> 1.3)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
brakeman
|
||||
bson_ext
|
||||
capybara
|
||||
carrierwave
|
||||
carrierwave-mongoid
|
||||
chinese_pinyin (= 0.4.1)
|
||||
coffee-rails
|
||||
database_cleaner
|
||||
debugger
|
||||
delorean
|
||||
devise (= 1.5.3)
|
||||
exception_notification
|
||||
execjs
|
||||
factory_girl_rails
|
||||
faker
|
||||
fb_graph
|
||||
impressionist!
|
||||
jquery-rails (= 2.1.4)
|
||||
jquery-ui-rails
|
||||
kaminari!
|
||||
mime-types
|
||||
mini_magick
|
||||
mongo_session_store-rails3 (= 3.0.6)
|
||||
mongoid (> 2.1, < 3.0.0)
|
||||
mongoid-encryptor
|
||||
mongoid-tree
|
||||
net-ldap (~> 0.3.1)
|
||||
nokogiri
|
||||
progress_bar
|
||||
pry
|
||||
pry-debugger
|
||||
pry-remote
|
||||
pry-stack_explorer
|
||||
rack-gridfs
|
||||
radius
|
||||
rails (~> 3.2.9)
|
||||
rake
|
||||
redis (>= 2.1.1)
|
||||
redis-namespace
|
||||
redis-search
|
||||
resque
|
||||
resque-restriction
|
||||
resque-scheduler
|
||||
rmmseg-cpp-huacnlee (= 0.2.9)
|
||||
rspec (~> 2.0)
|
||||
rspec-rails (~> 2.0)
|
||||
rubyzip
|
||||
sass-rails
|
||||
select2-rails (= 3.3.1)
|
||||
shoulda-matchers
|
||||
simplecov
|
||||
sinatra
|
||||
social-share-button
|
||||
spork
|
||||
sprockets
|
||||
sunspot-rails-tester
|
||||
sunspot_mongo
|
||||
sunspot_solr
|
||||
syslog-logger
|
||||
tinymce-rails
|
||||
uglifier
|
||||
watchr
|
||||
@@ -6,14 +6,7 @@ class Admin::MailCronLogsController < OrbitBackendController
|
||||
|
||||
def index
|
||||
|
||||
# @mail_cron_logs = MailCronLog.all.desc(:created_at).page(params[:page_main] ).per('20')
|
||||
@mail_cron_logs = (params[:sort]) ? get_sorted_and_filtered("mail_cron_log") : get_viewable("mail_cron_log")
|
||||
|
||||
respond_to do |format|
|
||||
format.html # index.html.erb
|
||||
format.xml { render :xml => @mail_crons }
|
||||
format.js
|
||||
end
|
||||
@mail_cron_logs = MailCronLog.all.desc(:created_at).page(params[:page_main] ).per('20')
|
||||
|
||||
end
|
||||
|
||||
|
||||
@@ -6,14 +6,7 @@ class Admin::MailCronsController < OrbitBackendController
|
||||
|
||||
def index
|
||||
|
||||
# @mail_crons = MailCron.all.asc(:mail_sentdate).page(params[:page_main] ).per('20')
|
||||
@mail_crons = (params[:sort]) ? get_sorted_and_filtered("mail_cron") : get_viewable("mail_cron")
|
||||
|
||||
respond_to do |format|
|
||||
format.html # index.html.erb
|
||||
format.xml { render :xml => @mail_crons }
|
||||
format.js
|
||||
end
|
||||
@mail_logs = MailCron.all.asc(:mail_sentdate).page(params[:page_main] ).per('20')
|
||||
|
||||
end
|
||||
|
||||
|
||||
@@ -12,22 +12,22 @@ class DefaultWidgetController< OrbitWidgetController
|
||||
|
||||
def query_for_default_widget
|
||||
|
||||
@ori_class_name = @default_widget["query"].split('.')[0]
|
||||
@ori_query = @default_widget["query"]
|
||||
@ori_class_name = @default_widget["query"].split('.')[0]
|
||||
result = nil
|
||||
result_objects = nil
|
||||
|
||||
if !params["tag_id"].blank?
|
||||
if params["category_id"].blank? #has tag no cate
|
||||
result = eval("#{@ori_query}.where(:tagged_ids.in => params['tag_id'])")
|
||||
result = @ori_class_name.constantize.where(:tagged_ids.in => params["tag_id"])
|
||||
else #has tag and cate
|
||||
result = eval("#{@ori_query}.where(:#{get_category_field_name}.in=>params['category_id'], :tagged_ids.in => params['tag_id'])")
|
||||
result = eval("#{@ori_class_name}.where(:#{get_category_field_name}.in=>params['category_id'], :tagged_ids.in => params['tag_id'])")
|
||||
end
|
||||
elsif params["category_id"].blank? #no tag no cate
|
||||
result = eval(@ori_query)
|
||||
result = eval(@default_widget["query"])
|
||||
else #no tag has cate
|
||||
result = eval("#{@ori_query}.where(:#{get_category_field_name}.in=>params['category_id'])")
|
||||
result = eval("#{@ori_class_name}.where(:#{get_category_field_name}.in=>params['category_id'])")
|
||||
end
|
||||
result.available_for_lang(I18n.locale).can_display
|
||||
result.available_for_lang(I18n.locale).can_display.desc(:is_top, :postdate)
|
||||
end
|
||||
|
||||
def search_result
|
||||
@@ -40,13 +40,9 @@ class DefaultWidgetController< OrbitWidgetController
|
||||
|
||||
def default_widget
|
||||
@search = params["search_query"].blank? ? false : true
|
||||
if !params[:id].blank? and !params["clicked_field_name"].blank?
|
||||
if !params[:id].blank?
|
||||
clicked_field_name = params["clicked_field_name"].to_sym
|
||||
redirect_to eval("#{@page_part.module_app.widget_fields_link_method[clicked_field_name][:method]}('#{params[:id]}', {inner: #{params[:inner] || true}})")
|
||||
elsif !params[:id].blank? and params["preview"]
|
||||
clicked_field_name = :title
|
||||
@preview_pages = @page_part.module_app.widget_fields_link_method.find_all{|t| t[1].has_key?(:preview)}.collect{|t| t[0]}
|
||||
redirect_to eval("#{@page_part.module_app.widget_fields_link_method[clicked_field_name][:method]}('#{params[:id]}', {preview: true,inner: #{params[:inner] || true},clicked_field_name: '#{@preview_pages.first.to_s}'})")
|
||||
else
|
||||
@tag_class = nil
|
||||
@default_widget = @page_part.module_app.get_default_widget
|
||||
|
||||
@@ -7,10 +7,4 @@ class OrbitFrontendComponentController< ApplicationController
|
||||
@app_title = request.fullpath.split('/')[2]
|
||||
end
|
||||
|
||||
def delay_impressionist(item)
|
||||
user_id = current_user.nil? ? nil : current_user.id
|
||||
Resque.enqueue(DelayedImpressionist,:request=>DelayImpressionistRequest.new(request),:obj=>item,:class=>item.class.to_s,:controller_name=>controller_name,:action_name=>action_name,:user=>user_id)
|
||||
end
|
||||
|
||||
|
||||
end
|
||||
@@ -44,13 +44,29 @@ class PagesController < ApplicationController
|
||||
# render :file => "#{Rails.root}/public/404.html", :status => :not_found
|
||||
#end
|
||||
end
|
||||
|
||||
def convert_array_param(key,array)
|
||||
array.collect{|t| "#{key}[]=#{t}"}.join("&")
|
||||
end
|
||||
|
||||
def index_from_link
|
||||
url = "/#{@item.path}"
|
||||
options = ''
|
||||
options << "#{options.blank? ? '?' : '&'}page_main=#{params[:page_main]}" unless params[:page_main].blank?
|
||||
options << "#{options.blank? ? '?' : '&'}#{convert_array_param('category_id', params[:category_id])}" unless params[:category_id].blank?
|
||||
options << "#{options.blank? ? '?' : '&'}#{convert_array_param('tag_id', params[:tag_id])}" unless params[:tag_id].blank?
|
||||
|
||||
if params[:category_id].is_a? Array
|
||||
options << "#{options.blank? ? '?' : '&'}#{convert_array_param('category_id',params[:category_id])}" unless params[:category_id].blank?
|
||||
elsif params[:category_id].is_a? String
|
||||
options << "#{options.blank? ? '?' : '&'}category_id=#{params[:category_id]}" unless params[:category_id].blank?
|
||||
end
|
||||
|
||||
if params[:tag_id].is_a? Array
|
||||
options << "#{options.blank? ? '?' : '&'}#{convert_array_param('tag_id',params[:tag_id])}" unless params[:tag_id].blank?
|
||||
elsif params[:category_id].is_a? String
|
||||
options << "#{options.blank? ? '?' : '&'}tag_id=#{params[:tag_id]}" unless params[:tag_id].blank?
|
||||
end
|
||||
|
||||
|
||||
options << "#{options.blank? ? '?' : '&'}search_query=#{params[:search_query]}" unless params[:search_query].blank?
|
||||
options << "#{options.blank? ? '?' : '&'}name=#{params[:name]}" unless params[:name].blank?
|
||||
uri = URI::escape(url + options)
|
||||
@@ -62,8 +78,8 @@ class PagesController < ApplicationController
|
||||
url = "/#{@item.path}"
|
||||
options = ''
|
||||
options << "#{options.blank? ? '?' : '&'}id=#{params[:id]}" unless params[:id].blank?
|
||||
options << "#{options.blank? ? '?' : '&'}#{convert_array_param('category_id', params[:category_id])}" unless params[:category_id].blank?
|
||||
options << "#{options.blank? ? '?' : '&'}#{convert_array_param('tag_id', params[:tag_id])}" unless params[:tag_id].blank?
|
||||
options << "#{options.blank? ? '?' : '&'}category_id=#{params[:category_id]}" unless params[:category_id].blank?
|
||||
options << "#{options.blank? ? '?' : '&'}tag_id=#{params[:tag_id]}" unless params[:tag_id].blank?
|
||||
options << "#{options.blank? ? '?' : '&'}preview=#{params[:preview]}" unless params[:preview].blank?
|
||||
options << "#{options.blank? ? '?' : '&'}controller_action=#{params[:controller_action]}" unless params[:controller_action].blank?
|
||||
options << "#{options.blank? ? '?' : '&'}clicked_field_name=#{params[:clicked_field_name]}" unless params[:clicked_field_name].blank?
|
||||
@@ -82,43 +98,23 @@ class PagesController < ApplicationController
|
||||
elsif params[:same_page_id]
|
||||
@item = Item.find(params[:same_page_id])
|
||||
else
|
||||
category_ids = Array(params[:category_id]) unless params[:category_id].nil?
|
||||
tag_ids = Array(params[:tag_id]) unless params[:tag_id].nil?
|
||||
category_ids = params[:category_id].is_a?(Array) ? params[:category_id] : [params[:category_id]]
|
||||
tag_ids = params[:tag_id].is_a?(Array) ? params[:tag_id] : [params[:tag_id]]
|
||||
module_app = ModuleApp.first(:conditions => {:key => params[:app_name]})
|
||||
|
||||
default_query = { is_published: true, module_app_id: module_app.id, :app_frontend_url.in => [params[:app_action], 'default_widget'] }
|
||||
specific_categories = { :category => category_ids }
|
||||
in_categories = { :category.in => category_ids }
|
||||
nil_categories = { :category.in => [nil, []] }
|
||||
specific_tags = { :tag => tag_ids }
|
||||
in_tags = { :tag.in => tag_ids }
|
||||
nil_tags = { :tag.in => [nil, []] }
|
||||
|
||||
if !category_ids.blank? && !tag_ids.blank?
|
||||
@item = Item.where(default_query.merge(specific_categories).merge(specific_tags)).first
|
||||
@item = Item.where(default_query.merge(specific_categories).merge(in_tags)).first unless @item
|
||||
@item = Item.where(default_query.merge(specific_categories).merge(nil_tags)).first unless @item
|
||||
@item = Item.where(default_query.merge(specific_tags).merge(in_categories)).first unless @item
|
||||
@item = Item.where(default_query.merge(specific_tags).merge(nil_categories)).first unless @item
|
||||
@item = Item.where(default_query.merge(in_categories).merge(in_tags)).first unless @item
|
||||
@item = Item.where(default_query.merge(in_categories).merge(nil_tags)).first unless @item
|
||||
@item = Item.where(default_query.merge(in_tags).merge(nil_categories)).first unless @item
|
||||
@item = Item.first(:conditions => {:module_app_id => module_app.id, :app_frontend_url => params[:app_action], :category.in => category_ids, :tag.in => tag_ids})
|
||||
@item = Item.first(:conditions => {:module_app_id => module_app.id, :app_frontend_url => params[:app_action], :category.in => category_ids, :tag.in => [nil, []]}) unless @item
|
||||
elsif !category_ids.blank?
|
||||
@item = Item.where(default_query.merge(specific_categories).merge(nil_tags)).first
|
||||
@item = Item.where(default_query.merge(specific_categories)).first unless @item
|
||||
@item = Item.where(default_query.merge(in_categories).merge(nil_tags)).first unless @item
|
||||
@item = Item.where(default_query.merge(in_categories)).first unless @item
|
||||
@item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action], :category.in => category_ids).any_in(tag: [nil, []]).first
|
||||
elsif !tag_ids.blank?
|
||||
@item = Item.where(default_query.merge(specific_tags).merge(nil_categories)).first
|
||||
@item = Item.where(default_query.merge(specific_tags)).first unless @item
|
||||
@item = Item.where(default_query.merge(in_tags).merge(nil_categories)).first unless @item
|
||||
@item = Item.where(default_query.merge(in_tags)).first unless @item
|
||||
@item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action], :tag.in => tag_ids).any_in(category: [nil, []]).first
|
||||
end
|
||||
@item = Item.find(params[:orig_page]) unless @item || params[:orig_page].blank?
|
||||
@item = Item.where(default_query.merge(nil_categories).merge(nil_tags)).first unless @item
|
||||
@item = Item.where(default_query).first unless @item
|
||||
@item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action]).all_of("tag" => {"$in" => [nil, []]},"category" => { "$in" => [nil, []]}).first unless @item
|
||||
@item = Item.where(module_app_id: module_app.id, app_frontend_url: 'default_widget').first unless @item
|
||||
@item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action]).first unless @item
|
||||
end
|
||||
raise PageError, 'Missing Frontend Page' if @item.nil?
|
||||
raise PageError,'Missing Frontend Page' if @item.nil?
|
||||
end
|
||||
|
||||
def save_from_no_lang_for_page
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
# encoding: utf-8
|
||||
|
||||
class SessionsController < Devise::SessionsController
|
||||
prepend_before_filter :require_no_authentication, :only => [ :new, :create ]
|
||||
|
||||
require 'savon'
|
||||
|
||||
def create
|
||||
|
||||
@sys_id = params["sys_id"]
|
||||
|
||||
client = Savon.client(wsdl: 'http://sso.ntue.edu.tw/soap/soapserver.php?wsdl')
|
||||
|
||||
client.operations
|
||||
|
||||
response = client.call(:chkidno, message: { sys_id: @sys_id })
|
||||
|
||||
@id = response.body[:chkidno_response][:return][:id]
|
||||
|
||||
login_uid = @id
|
||||
|
||||
resource = User.first(conditions:{user_id: login_uid})
|
||||
|
||||
if !resource.blank?
|
||||
resource_name = resource.class.to_s.downcase
|
||||
sign_in(resource_name, resource)
|
||||
redirect_to after_sign_in_path_for(resource)
|
||||
else
|
||||
flash[:error] = "很抱歉,您無此權限或帳號登入本站,請洽本站管理員<br />Sorry, you don't have the account or authority to login. Please contact the website administrator."
|
||||
redirect_to :root
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
@@ -1,5 +1,5 @@
|
||||
module ApplicationHelper
|
||||
include OrbitApp::Module::VisitorCounter
|
||||
|
||||
FLASH_NOTICE_KEYS = [:error, :notice, :warning]
|
||||
|
||||
|
||||
@@ -7,10 +7,8 @@ module ApplicationHelper
|
||||
request.referer.include?('?') ? [request.referer,param_hash.to_param].join('&') : [request.referer,param_hash.to_param].join('?')
|
||||
end
|
||||
|
||||
def delayed_impressionist(item)
|
||||
user_id = current_user.nil? ? nil : current_user.id
|
||||
request = DelayImpressionistRequest.new(request)
|
||||
Resque.enqueue(DelayedImpressionist,:request=>request,:obj=>item,:class=>item.class.to_s,:controller_name=>controller_name,:action_name=>action_name,:user=>user_id)
|
||||
def delayed_impressionist(object)
|
||||
# Resque.enqueue_at(1.minute.from_now,DelayedImpressionist,object)
|
||||
end
|
||||
|
||||
def check_user_role_enable(attribute_fields)
|
||||
@@ -244,27 +242,25 @@ module ApplicationHelper
|
||||
"#{t(:view_count)}: #{object.view_count}"
|
||||
end
|
||||
|
||||
# def display_visitors(options={})
|
||||
# # Impression.where(options).and(:referrer.ne => nil).distinct(:session_hash).count
|
||||
# impressions = Impression.where(options).and(:referrer.ne => nil)
|
||||
# impressions.map{|i| i[:session_hash]}.uniq.count
|
||||
# end
|
||||
def display_visitors(options={})
|
||||
Impression.where(options).and(:referrer.ne => nil).distinct(:session_hash).count
|
||||
end
|
||||
|
||||
# def display_visitors_today
|
||||
# display_visitors(created_at: {'$gte' => Date.today.beginning_of_day, '$lte' => Date.today.end_of_day})
|
||||
# end
|
||||
def display_visitors_today
|
||||
display_visitors(created_at: {'$gte' => Date.today.beginning_of_day, '$lte' => Date.today.end_of_day})
|
||||
end
|
||||
|
||||
# def display_visitors_this_week
|
||||
# display_visitors(created_at: {'$gte' => Date.today.beginning_of_week, '$lte' => Date.today.end_of_week})
|
||||
# end
|
||||
def display_visitors_this_week
|
||||
display_visitors(created_at: {'$gte' => Date.today.beginning_of_week, '$lte' => Date.today.end_of_week})
|
||||
end
|
||||
|
||||
# def display_visitors_this_month
|
||||
# display_visitors(created_at: {'$gte' => Date.today.beginning_of_month, '$lte' => Date.today.end_of_month})
|
||||
# end
|
||||
def display_visitors_this_month
|
||||
display_visitors(created_at: {'$gte' => Date.today.beginning_of_month, '$lte' => Date.today.end_of_month})
|
||||
end
|
||||
|
||||
# def display_visitors_this_year
|
||||
# display_visitors(created_at: {'$gte' => Date.today.beginning_of_year, '$lte' => Date.today.end_of_year})
|
||||
# end
|
||||
def display_visitors_this_year
|
||||
display_visitors(created_at: {'$gte' => Date.today.beginning_of_year, '$lte' => Date.today.end_of_year})
|
||||
end
|
||||
|
||||
def display_date_time(object)
|
||||
object.strftime("%Y-%m-%d %H:%M")
|
||||
@@ -315,8 +311,4 @@ module ApplicationHelper
|
||||
link_to title, params.merge({direction: direction, sort: column, sort_options: column}), {:class => "#{css_class} sortable", :remote => options[:remote]}
|
||||
end
|
||||
|
||||
def convert_array_param(key, array)
|
||||
Array(array).collect{|t| "#{key}[]=#{t}"}.join("&")
|
||||
end
|
||||
|
||||
end
|
||||
@@ -3,13 +3,6 @@ module DefaultWidgetHelper
|
||||
I18n.t("#{@page_part.module_app.key}.default_widget.#{field}")
|
||||
end
|
||||
|
||||
def get_top_hot_class(row_data)
|
||||
class_attr = []
|
||||
class_attr << 'data_is_hot' if( row_data.is_hot? rescue false )
|
||||
class_attr << 'data_is_top' if( row_data.is_top? rescue false)
|
||||
return class_attr.join(" ")
|
||||
end
|
||||
|
||||
def link_to_field(row_data,field, switch, options=nil)
|
||||
method_ary = @page_part.module_app.widget_fields_link_method
|
||||
field = field.to_sym
|
||||
@@ -84,13 +77,4 @@ module DefaultWidgetHelper
|
||||
content_tag(:span,get_display(row_data,field_setting),:class=>field_setting[:class])
|
||||
end
|
||||
end
|
||||
|
||||
def get_row_category(row_data)
|
||||
row_data.send("#{row_data.class.to_s.underscore}_category_id") rescue nil
|
||||
end
|
||||
|
||||
def get_row_tags(row_data)
|
||||
row_data.tagged_ids rescue nil
|
||||
end
|
||||
|
||||
end
|
||||
@@ -1,21 +1,36 @@
|
||||
class DashboardCounter < Resque::Plugins::RestrictionJob
|
||||
extend OrbitApp::Module::VisitorCounterEval
|
||||
|
||||
@queue = :high
|
||||
|
||||
def self.perform(*args)
|
||||
site = Site.first
|
||||
obj = new(*args)
|
||||
site.visitor_counters[:total] = display_visitors
|
||||
site.visitor_counters[:today] = display_visitors_today
|
||||
site.visitor_counters[:this_week] = display_visitors_this_week
|
||||
site.visitor_counters[:this_month] = display_visitors_this_month
|
||||
site.visitor_counters[:this_year] = display_visitors_this_year
|
||||
site.dashboard_counter[:visitors_this_week] = obj.display_visitors_this_week
|
||||
site.dashboard_counter[:visitors_this_month] = obj.display_visitors_this_month
|
||||
site.dashboard_counter[:visitors_this_year] = obj.display_visitors_this_year
|
||||
site.save
|
||||
OrbitLogger.info "DashboardCounter done #{site.visitor_counters.to_s}"
|
||||
OrbitLogger.info "DashboardCounter done #{site.dashboard_counter.to_s}"
|
||||
end
|
||||
|
||||
#Notice this is mainly used at user dashbroad. however the code there is currentlly using realtime evaluation.
|
||||
#and the site model will need a field call dashboard_counter to complete this job.
|
||||
|
||||
def display_visitors(options={})
|
||||
impressions = Impression.where(options).and(:referrer.ne => nil)
|
||||
impressions.map{|i| i[:session_hash]}.uniq.count
|
||||
end
|
||||
|
||||
def display_visitors_today
|
||||
display_visitors(created_at: {'$gte' => Date.today.beginning_of_day, '$lte' => Date.today.end_of_day})
|
||||
end
|
||||
|
||||
def display_visitors_this_week
|
||||
display_visitors(created_at: {'$gte' => Date.today.beginning_of_week, '$lte' => Date.today.end_of_week})
|
||||
end
|
||||
|
||||
def display_visitors_this_month
|
||||
display_visitors(created_at: {'$gte' => Date.today.beginning_of_month, '$lte' => Date.today.end_of_month})
|
||||
end
|
||||
|
||||
def display_visitors_this_year
|
||||
display_visitors(created_at: {'$gte' => Date.today.beginning_of_year, '$lte' => Date.today.end_of_year})
|
||||
end
|
||||
|
||||
end
|
||||
@@ -1,45 +1,7 @@
|
||||
class DelayedImpressionist
|
||||
def self.before_filter(*args)
|
||||
return
|
||||
end
|
||||
|
||||
include ImpressionistController::InstanceMethods
|
||||
@queue = :low
|
||||
|
||||
def initialize(request,controller_name,action_name,user,obj)
|
||||
@controller_name = controller_name
|
||||
@action_name = action_name
|
||||
@user = User.find user unless user.nil?
|
||||
@request = request
|
||||
end
|
||||
|
||||
def self.perform(*args)
|
||||
arg = args[0]
|
||||
@request= DelayImpressionistRequest.new
|
||||
@request.restore(arg["request"])
|
||||
request = @request
|
||||
obj = eval("#{arg["class"]}.find '#{arg['obj']['_id']}'")
|
||||
# imp = new(@request,arg["controller_name"],arg["action_name"],arg["user"],obj)
|
||||
new_impression = obj.impressions.build(:user_id=>arg["user"],:controller_name=>arg["controller_name"],:action_name=>arg["action_name"],:ip_address=>@request.remote_ip,:referrer=>@request.referer)
|
||||
new_impression.save
|
||||
obj.update_attribute(:view_count,obj.impression_count)
|
||||
end
|
||||
|
||||
private
|
||||
def user
|
||||
@user
|
||||
end
|
||||
|
||||
def action_name
|
||||
@action_name
|
||||
end
|
||||
|
||||
def controller_name
|
||||
@controller_name
|
||||
end
|
||||
|
||||
def request
|
||||
@request
|
||||
end
|
||||
|
||||
class DelayedImpressionist
|
||||
@queue = :low
|
||||
def self.perform(object)
|
||||
impressionist(object)
|
||||
true
|
||||
end
|
||||
end
|
||||
@@ -3,7 +3,7 @@ class UpdateTagCloud
|
||||
|
||||
def self.perform()
|
||||
Tag.all.each do |tag|
|
||||
tag.update_attribute(:cloud_view_count, tag.get_impressionist)
|
||||
tag.update_attribute(:cloud_view_count, tag.impressionist_count(:created_at.gte => 14.days.ago, :created_at.lte => Time.now))
|
||||
end
|
||||
OrbitLogger.info "UpdateTagCloud Done"
|
||||
end
|
||||
|
||||
@@ -62,7 +62,7 @@ class MailCronMailer < ActionMailer::Base
|
||||
@mail_cron_log = {
|
||||
:mail_subject => @data.mail_subject,
|
||||
:mail_to => group_mail,
|
||||
:mail_user => @user.name,
|
||||
:mail_user => @user.user_id,
|
||||
:mailer_count => group_mail.split(",").size,
|
||||
:mail_from_app => @data.mail_from_app
|
||||
}
|
||||
|
||||
@@ -29,42 +29,4 @@ class MailCron
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def self.send_mail_now(mail_cron_id)
|
||||
|
||||
mail_data = MailCron.find(mail_cron_id)
|
||||
|
||||
if !mail_data.blank?
|
||||
|
||||
@mail_j = 0
|
||||
@read_mails = Array.new
|
||||
|
||||
@mails = mail_data.mail_to.split(",")
|
||||
|
||||
@mails.each do |send_mail|
|
||||
|
||||
@read_mails << send_mail
|
||||
|
||||
@mail_j += 1
|
||||
|
||||
if 0 == @mail_j % 30
|
||||
MailCronMailer.cron_mail( mail_data.id, @read_mails.join(',') ).deliver
|
||||
@read_mails = Array.new
|
||||
|
||||
sleep 10
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
if !@read_mails.join(',').blank?
|
||||
MailCronMailer.cron_mail( mail_data.id, @read_mails.join(',') ).deliver
|
||||
@read_mails = Array.new
|
||||
|
||||
sleep 10
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
@@ -140,7 +140,7 @@ class ModuleApp
|
||||
def sorted_tags_for_cloud
|
||||
temp_tags = {}
|
||||
self.tags.each{ |tag|
|
||||
temp_tags.merge!({tag => tag.cloud_view_count})
|
||||
temp_tags.merge!({tag => Tag.get_impressionist(tag)})
|
||||
}
|
||||
if !temp_tags.blank?
|
||||
sorted_tags = temp_tags.sort{|a,b| a[1]<=>b[1]}.reverse
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ class Page < Item
|
||||
include Impressionist::Impressionable
|
||||
include ParserFrontEnd
|
||||
|
||||
is_impressionable #:counter_cache => { :column_name => :view_count }
|
||||
is_impressionable :counter_cache => { :column_name => :view_count }
|
||||
|
||||
field :content, localize: true
|
||||
field :app_frontend_url
|
||||
|
||||
@@ -51,9 +51,8 @@ class PrototypeAuth
|
||||
end
|
||||
|
||||
def remove_operation(item,obj)
|
||||
item = (item.to_s.singularize == item.to_s) ? "#{item.to_s}_id" : "#{item.to_s.singularize}_ids"
|
||||
if (self.send item).include? obj.id
|
||||
(self.send item).delete obj.id
|
||||
if (self.send item).include? obj
|
||||
(self.send item).delete obj
|
||||
self.save!
|
||||
else
|
||||
false #should put error message for user not existed in list
|
||||
|
||||
@@ -18,7 +18,6 @@ class Site
|
||||
field :title_always_on, :type => Boolean, :default => false
|
||||
field :dashbroad_allow_visitor, :type => Boolean, :default => false
|
||||
field :mail_settings, :type => Hash
|
||||
field :visitor_counters,:type=> Hash,:default=>{:total=>0,:today=>0,:this_week=>0,:this_month=>0,:this_year=>0}
|
||||
|
||||
field :disk_space, :type => String
|
||||
field :system_package_info, :type => Hash,:default=>{}
|
||||
|
||||
+25
-1
@@ -8,7 +8,7 @@ class Tag
|
||||
include Mongoid::Timestamps
|
||||
include Impressionist::Impressionable
|
||||
|
||||
is_impressionable #:counter_cache => { :column_name => :view_count }
|
||||
is_impressionable :counter_cache => { :column_name => :view_count }
|
||||
|
||||
field :name, localize: true
|
||||
field :view_count, :type => Integer, :default => 0
|
||||
@@ -17,6 +17,30 @@ class Tag
|
||||
belongs_to :module_tag, polymorphic: true
|
||||
has_many :taggings, dependent: :destroy
|
||||
|
||||
#field :cloud_amper,:type: Integer,:default=> 0
|
||||
|
||||
# def self.sorted_for_cloud
|
||||
# tags = {}
|
||||
# self.all.each{ |tag|
|
||||
# tags.merge!({tag => self.get_impressionist(tag)})
|
||||
# }
|
||||
# if !tags.blank?
|
||||
# sorted_tags = tags.sort{|a,b| a[1]<=>b[1]}.reverse
|
||||
# sorted_tags[0][1] = :hot1
|
||||
# offset = (sorted_tags.size - 1) / 3
|
||||
# i = 1
|
||||
# class_i = 2
|
||||
# sorted_tags[1..-1].collect!{ |x|
|
||||
# x[1] = "hot#{class_i}"
|
||||
# i == offset ? i = 1 : i += 1 if class_i < 4
|
||||
# class_i += 1 if i == offset && class_i < 4
|
||||
# }
|
||||
# sorted_tags
|
||||
# else
|
||||
# []
|
||||
# end
|
||||
# end
|
||||
|
||||
protected
|
||||
|
||||
def self.get_impressionist(item_tag = self)
|
||||
|
||||
@@ -3,7 +3,7 @@ class User
|
||||
include Mongoid::Document
|
||||
include Mongoid::Timestamps
|
||||
|
||||
devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable #, :timeoutable
|
||||
devise :database_authenticatable, :recoverable, :rememberable, :trackable, :registerable, :validatable #, :timeoutable
|
||||
|
||||
mount_uploader :avatar, AvatarUploader
|
||||
|
||||
|
||||
@@ -8,5 +8,6 @@
|
||||
</table>
|
||||
|
||||
<div class="form-actions form-fixed pagination-right">
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t(:add), new_admin_design_path, :class => 'btn btn-primary pull-right' %>
|
||||
<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t(:upload), upload_package_admin_designs_path, :class => 'btn btn-primary pull-right' %>
|
||||
</div>
|
||||
@@ -1,6 +1,6 @@
|
||||
<%= render_sort_bar(true, delete_admin_mail_cron_logs_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]),
|
||||
['subject', 'mail_subject','span2', :subject] ,
|
||||
['subject', 'subject','span2', :subject] ,
|
||||
['mail_to', 'mail_to','span2', :mail_to] ,
|
||||
['mail_user', 'mail_user','span2', :mail_user] ,
|
||||
['mail_from_app', 'mail_from_app','span2', :mail_from_app] ,
|
||||
['sentdate', 'created_at','span2', :sentdate] ).html_safe %>
|
||||
['sentdate', 'sentdate','span2', :sentdate] ).html_safe %>
|
||||
@@ -1,4 +1,3 @@
|
||||
$("#delete_all").attr("action", "<%= delete_admin_mail_cron_logs_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]) %>");
|
||||
$("#sort_headers").html("<%= j render 'sort_headers' %>");
|
||||
$("#tbody_mail_cron_logs").html("<%= j render :partial => 'mail_cron_log', :collection => @mail_cron_logs %>");
|
||||
$("#mail_cron_log_pagination").html("<%= j paginate @mail_cron_logs, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>");
|
||||
@@ -1,5 +1,5 @@
|
||||
<%= render_sort_bar(true, delete_admin_mail_crons_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]),
|
||||
['subject', 'mail_subject','span2', :mail_subject] ,
|
||||
['subject', 'subject','span2', :subject] ,
|
||||
['mail_to', 'mail_to','span2', :mail_to] ,
|
||||
['mail_from_app', 'mail_from_app','span2', :mail_from_app] ,
|
||||
['sentdate', 'mail_sentdate','span2', :mail_sentdate] ).html_safe %>
|
||||
['sentdate', 'sentdate','span2', :sentdate] ).html_safe %>
|
||||
@@ -1,3 +1,4 @@
|
||||
|
||||
<% content_for :side_bar do %>
|
||||
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
|
||||
<% end %>
|
||||
@@ -14,14 +15,14 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="tbody_mail_crons" class="sort-holder">
|
||||
<%= render :partial => "mail_cron",:collection=> @mail_crons%>
|
||||
<%= render :partial => "mail_cron",:collection=> @mail_logs%>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
|
||||
<div class="form-actions form-fixed pagination-right">
|
||||
<div id="web_link_pagination" class="paginationFixed">
|
||||
<%= paginate @mail_crons, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
|
||||
<%= paginate @mail_logs, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
$("#delete_all").attr("action", "<%= delete_admin_mail_crons_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]) %>");
|
||||
$("#sort_headers").html("<%= j render 'sort_headers' %>");
|
||||
$("#tbody_mail_crons").html("<%= j render :partial => 'mail_cron', :collection => @mail_crons %>");
|
||||
$("#mail_cron_pagination").html("<%= j paginate @mail_crons, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>");
|
||||
@@ -1,22 +1,19 @@
|
||||
<%= content_tag :div, class: @tag_class do %>
|
||||
<%= content_tag :div,:class=>@tag_class do%>
|
||||
<div class="default_widget_type_A">
|
||||
<table class="default_widget_tb" border="0" cellpadding="0" cellspacing="0" >
|
||||
<thead>
|
||||
<thead>
|
||||
<tr>
|
||||
<% @frontend_field_names.each_with_index do |field,index|%>
|
||||
<%= content_tag(:th,content_tag(:span,get_field_header(field),:class=>@frontend_classes[index]))unless field.blank?%>
|
||||
<% end %>
|
||||
</tr>
|
||||
</thead>
|
||||
<% @data.each do |row_data| %>
|
||||
<tr>
|
||||
<% @frontend_field_names.each_with_index do |field, index| %>
|
||||
<%= content_tag(:th, content_tag(:span, get_field_header(field), class: @frontend_classes[index])) unless field.blank? %>
|
||||
<% @frontend_field_names.each_with_index do |field,index|%>
|
||||
<%= content_tag(:td,content_tag(:span,link_to_field(row_data,field, @frontend_sat_to_links[index], {orig_page: @page_id.to_s}),:class=>@frontend_classes[index]))unless field.blank?%>
|
||||
<% end %>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<% @data.each do |row_data| %>
|
||||
<tr class="<%= get_top_hot_class(row_data) %>">
|
||||
<% @frontend_field_names.each_with_index do |field, index|%>
|
||||
<%= content_tag(:td, content_tag(:span, link_to_field(row_data, field, @frontend_sat_to_links[index], {orig_page: @page_id.to_s, category_id: get_row_category(row_data), tag_id: get_row_tags(row_data)}), class: @frontend_classes[index])) unless field.blank? %>
|
||||
<% end %>
|
||||
</tr>
|
||||
<% end %>
|
||||
</tbody>
|
||||
<% end %>
|
||||
</table>
|
||||
</div>
|
||||
<% end %>
|
||||
<% end %>
|
||||
@@ -1,13 +1,13 @@
|
||||
<%= content_tag :div, class: @tag_class do %>
|
||||
<%= content_tag :div,:class=>@tag_class do%>
|
||||
<ul class="default_widget_list">
|
||||
<% @data.each do |row_data| %>
|
||||
<%= content_tag(:li, class: get_top_hot_class(row_data)) do %>
|
||||
<%= content_tag(:li) do %>
|
||||
<div class="img app-pic">
|
||||
<%= image_tag row_data.send(@widget_image_field) %>
|
||||
<%= image_tag row_data.send(@widget_image_field)%>
|
||||
</div>
|
||||
<div class="wrap">
|
||||
<% @frontend_field_names.each_with_index do |field, index| %>
|
||||
<%= content_tag(:span, link_to_field(row_data,field, @frontend_sat_to_links[index], {orig_page: @page_id.to_s, category_id: get_row_category(row_data), tag_id: get_row_tags(row_data)}), class: @frontend_classes[index]) unless field.blank? %>
|
||||
<% @frontend_field_names.each_with_index do |field,index|%>
|
||||
<%= content_tag(:span,link_to_field(row_data,field, @frontend_sat_to_links[index], {orig_page: @page_id.to_s}),:class=>@frontend_classes[index]) unless field.blank?%>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
<%= content_tag :div, class: @tag_class do %>
|
||||
<%= content_tag :div,:class=>@tag_class do%>
|
||||
<div class="img app-pic">
|
||||
<%= image_tag @data.first.send(@widget_image_field) %>
|
||||
<%= image_tag @data.first.send(@widget_image_field)%>
|
||||
</div>
|
||||
<ul class="default_widget_list">
|
||||
<% @data.each do |row_data| %>
|
||||
<%= content_tag(:li, class: get_top_hot_class(row_data)) do %>
|
||||
<% @frontend_field_names.each_with_index do |field, index|%>
|
||||
<%= content_tag(:span, link_to_field(row_data, field, @frontend_sat_to_links[index], {orig_page: @page_id.to_s, category_id: get_row_category(row_data), tag_id: get_row_tags(row_data)}), class: @frontend_classes[index]) unless field.blank? %>
|
||||
<%= content_tag(:li) do %>
|
||||
<% @frontend_field_names.each_with_index do |field,index|%>
|
||||
<%= content_tag(:span, link_to_field(row_data,field, @frontend_sat_to_links[index], {orig_page: @page_id.to_s}),:class=>@frontend_classes[index]) unless field.blank?%>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
@@ -34,15 +34,15 @@ Orbit::Application.configure do
|
||||
# :sender_address => %{"notifier" <redmine@rulingcom.com>},
|
||||
# :exception_recipients => %w{chris@rulingcom.com}
|
||||
|
||||
# config.action_mailer.delivery_method = :smtp
|
||||
# config.action_mailer.smtp_settings = {
|
||||
# :enable_starttls_auto => true,
|
||||
# :address => "smtp.gmail.com",
|
||||
# :port => '587',
|
||||
# :domain => "smtp.gmail.com",
|
||||
# :authentication => "plain",
|
||||
# :user_name => "redmine@rulingcom.com",
|
||||
# :password => "rulingredmine" }
|
||||
config.action_mailer.delivery_method = :smtp
|
||||
config.action_mailer.smtp_settings = {
|
||||
:enable_starttls_auto => true,
|
||||
:address => "smtp.gmail.com",
|
||||
:port => '587',
|
||||
:domain => "smtp.gmail.com",
|
||||
:authentication => "plain",
|
||||
:user_name => "redmine@rulingcom.com",
|
||||
:password => "rulingredmine" }
|
||||
|
||||
end
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@ defaults: &defaults
|
||||
|
||||
development:
|
||||
<<: *defaults
|
||||
database: demo_site_development
|
||||
database: production_7
|
||||
test:
|
||||
<<: *defaults
|
||||
database: test_site
|
||||
|
||||
@@ -1,9 +1,3 @@
|
||||
dashboard_counter_cache:
|
||||
cron: 0 * * * * *
|
||||
class: DashboardCounter
|
||||
args:
|
||||
description: DashboardCounterCache
|
||||
|
||||
update_tag_cloud:
|
||||
cron: 0 0 [0,12] * * *
|
||||
class: UpdateTagCloud
|
||||
@@ -16,8 +10,8 @@ generate_system_summary:
|
||||
args:
|
||||
description: Generate the system status such as disk free space,package version list for showing at site tab
|
||||
|
||||
email_cron:
|
||||
email_cron:
|
||||
cron: 0 0 [10,16,22] * * *
|
||||
class: EmailCron
|
||||
args:
|
||||
description: EmailCron
|
||||
description: EmailCron
|
||||
@@ -7,11 +7,6 @@ Orbit::Application.routes.draw do
|
||||
match "/users_passwd" => "desktop/registrations#update", :as => :users_passwd, :via => :put
|
||||
end
|
||||
|
||||
devise_scope :user do
|
||||
get 'soap_login' => 'sessions#create'
|
||||
end
|
||||
|
||||
|
||||
mount Resque::Server, :at => "/admin/resque"
|
||||
mount Rack::GridFS::Endpoint.new(:db => Mongoid.database,:lookup=>:path), :at => "gridfs"
|
||||
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
class DelayImpressionistRequest
|
||||
attr_accessor :session_options,:remote_ip,:referer,:user_agent
|
||||
def initialize(request=nil)
|
||||
if request
|
||||
self.session_options=request.session_options
|
||||
self.remote_ip=request.remote_ip
|
||||
self.referer=request.referer
|
||||
self.user_agent=request.user_agent
|
||||
end
|
||||
end
|
||||
|
||||
def restore(args)
|
||||
args.each do |key,value|
|
||||
self.send("#{key}=", value)
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
@@ -6,14 +6,15 @@ module DefaultWidgetTagHelper
|
||||
@request = req
|
||||
params.delete :inner
|
||||
@params = params
|
||||
params_str = "?"
|
||||
|
||||
params_str ="?"
|
||||
params.each do |index,param|
|
||||
if param.is_a?(Array) and !param.blank?
|
||||
params_str << "&" unless params_str.eql?("?")
|
||||
params_str << param.collect{|t| "#{index}[]=#{t}"}.join("&")
|
||||
params.delete index
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
params_str = params_str + (params_str.eql?("?") ? params.to_param : "&#{params.to_param}" )
|
||||
content_tag :div,:class=> 'more' do
|
||||
link_to I18n.t(@more_link[:label_i18n]),[eval("#{@more_link[:path_method]}"),params_str].join()
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
module OrbitApp
|
||||
module Module
|
||||
module VisitorCounter
|
||||
Version = "0.1"
|
||||
|
||||
def display_visitors(options={})
|
||||
Site.first.visitor_counters["total"]
|
||||
end
|
||||
|
||||
def display_visitors_today
|
||||
Site.first.visitor_counters["today"]
|
||||
end
|
||||
|
||||
def display_visitors_this_week
|
||||
Site.first.visitor_counters["this_week"]
|
||||
end
|
||||
|
||||
def display_visitors_this_month
|
||||
Site.first.visitor_counters["this_month"]
|
||||
end
|
||||
|
||||
def display_visitors_this_year
|
||||
Site.first.visitor_counters["this_year"]
|
||||
end
|
||||
|
||||
end # of VisitorCounter
|
||||
end # of Module
|
||||
end # of OrbitApp
|
||||
@@ -1,27 +0,0 @@
|
||||
module OrbitApp
|
||||
module Module
|
||||
module VisitorCounterEval
|
||||
Version = "0.1"
|
||||
|
||||
def display_visitors(options={})
|
||||
impressions = Impression.where(options).and(:referrer.ne => nil).distinct(:session_hash).count
|
||||
end
|
||||
|
||||
def display_visitors_today
|
||||
display_visitors(created_at: {'$gte' => Date.today.beginning_of_day, '$lte' => Date.today.end_of_day})
|
||||
end
|
||||
|
||||
def display_visitors_this_week
|
||||
display_visitors(created_at: {'$gte' => Date.today.beginning_of_week, '$lte' => Date.today.end_of_week})
|
||||
end
|
||||
|
||||
def display_visitors_this_month
|
||||
display_visitors(created_at: {'$gte' => Date.today.beginning_of_month, '$lte' => Date.today.end_of_month})
|
||||
end
|
||||
|
||||
def display_visitors_this_year
|
||||
display_visitors(created_at: {'$gte' => Date.today.beginning_of_year, '$lte' => Date.today.end_of_year})
|
||||
end
|
||||
end # end of VisitorCounterEval
|
||||
end # of Module
|
||||
end # of OrbitApp
|
||||
@@ -79,10 +79,9 @@ module OrbitCoreLib
|
||||
else
|
||||
auth_object_space = ObjectAuth.where(obj_authable_type: self.to_s,title: title)
|
||||
end
|
||||
|
||||
query1 = auth_object_space.any_in({sub_role_ids: sub_role_ids_ary}).excludes(blocked_user_ids: user.id)
|
||||
query2 = auth_object_space.any_of({all: true},{privilege_user_ids: user.id}).excludes(blocked_user_ids: user.id)
|
||||
# query2 = auth_object_space.any_of({all: true},{privilege_user_ids: user.id},{role_ids: user.role_ids}).excludes(blocked_user_ids: user.id) #save for backup if something went wrong (0626 Matt)
|
||||
|
||||
query2 = auth_object_space.any_of({all: true},{privilege_user_ids: user.id},{role_ids: user.role_ids}).excludes(blocked_user_ids: user.id)
|
||||
result = (query1 + query2).uniq
|
||||
result.collect{|t| t.obj_authable}.delete_if{|val| val==nil}
|
||||
end
|
||||
|
||||
@@ -43,7 +43,6 @@ module OrbitTag
|
||||
def tags=(tag_ids)
|
||||
ids = [tag_ids].flatten
|
||||
tag_ids.delete('')
|
||||
self.tagged_ids = tag_ids
|
||||
ids = self.taggings.blank? ? [] : self.taggings.map{|t| t.tag.id}
|
||||
tag_ids.each do |tag_id|
|
||||
unless ids.include? tag_id
|
||||
@@ -59,6 +58,9 @@ module OrbitTag
|
||||
|
||||
def tag_ids=(ids)
|
||||
self.tags = ids
|
||||
ids = [ids].flatten
|
||||
ids.delete('')
|
||||
self.tagged_ids = ids
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
@@ -310,20 +310,4 @@ namespace :migrate do
|
||||
Rake::Task["web_link_url:web_link_url_i18n"].execute
|
||||
end
|
||||
|
||||
task :fix_tagged_ids => :environment do
|
||||
Tag.all.each do |tag|
|
||||
tag.taggings.each do |tagging|
|
||||
tagged_ids = tagging.taggable.tagged_ids
|
||||
unless tagged_ids.include?(tag.id.to_s)
|
||||
tagged_ids << tag.id.to_s
|
||||
tagging.taggable.update_attribute(:tagged_ids, tagged_ids)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
task :clear_news_tags => :environment do
|
||||
`mongo #{Mongoid.config.database.name} --eval "db.tags.remove({_type: {$ne: 'Tag'}})"`
|
||||
end
|
||||
|
||||
end
|
||||
-73
@@ -1,4 +1,3 @@
|
||||
# encoding: utf-8
|
||||
class Panel::Announcement::BackEnd::ApprovalsController < OrbitBackendController
|
||||
before_filter :authenticate_user!
|
||||
before_filter :is_admin?
|
||||
@@ -7,7 +6,6 @@ class Panel::Announcement::BackEnd::ApprovalsController < OrbitBackendControlle
|
||||
|
||||
|
||||
def preview_and_approve
|
||||
email_group_data
|
||||
@bulletin = Bulletin.find params[:bulletin_id]
|
||||
end
|
||||
|
||||
@@ -17,14 +15,6 @@ class Panel::Announcement::BackEnd::ApprovalsController < OrbitBackendControlle
|
||||
@bulletin.proc_check(params[:bulletin][:is_checked],params[:bulletin][:not_checked_reason])
|
||||
@bulletin.de_pending
|
||||
if @bulletin.save
|
||||
|
||||
if @bulletin.email_sent == true && @bulletin.is_checked == true && !@bulletin.is_rejected
|
||||
send_email_data(@bulletin)
|
||||
|
||||
@bulletin.email_sent = false
|
||||
@bulletin.save
|
||||
end
|
||||
|
||||
notice = t('announcement.approve_bulletin_success')
|
||||
else
|
||||
notice = t('announcement.approve_bulletin_fail')
|
||||
@@ -71,69 +61,6 @@ class Panel::Announcement::BackEnd::ApprovalsController < OrbitBackendControlle
|
||||
object_auth.privilege_users = privilege_users
|
||||
object_auth
|
||||
end
|
||||
|
||||
def send_email_data(bulletin)
|
||||
|
||||
@site = Site.first
|
||||
@user = User.find(bulletin.create_user_id)
|
||||
@host = request.host_with_port
|
||||
|
||||
email_group_data
|
||||
|
||||
@group_mail = Array.new
|
||||
|
||||
bulletin.email_group.each do |egroup|
|
||||
|
||||
if @email_group_data.include?(egroup) and (egroup == '0' or egroup == '1' or egroup == '2' or egroup == '3')
|
||||
|
||||
@group_mail << @email_group_data[egroup]["email"]
|
||||
|
||||
elsif @email_group_data.include?(egroup) and egroup == '4'
|
||||
|
||||
@group_mail << bulletin.other_mailaddress
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
if !@group_mail.join.blank?
|
||||
|
||||
@mail_content = {
|
||||
"host" => @host,
|
||||
"site_title" => @site.title,
|
||||
"title" => bulletin.title,
|
||||
"template" => 'announcement_mailer/cron_mail',
|
||||
"url" => "http://#{@host}#{panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id)}"
|
||||
}
|
||||
|
||||
@mail_cron = {
|
||||
:mail_from_app => 'announcement',
|
||||
:mail_from => @user.email,
|
||||
:mail_reply_to => @user.email,
|
||||
:mail_subject => "#{t("announcement.mail_subject",:site_title => @site.title)}：#{bulletin.title}",
|
||||
:mail_to => @group_mail.join(','),
|
||||
:mail_content => @mail_content ,
|
||||
# :mail_sentdate => bulletin.email_sentdate,
|
||||
:mail_sentdate => DateTime.now,
|
||||
:create_user_id => bulletin.create_user_id,
|
||||
:update_user_id => bulletin.create_user_id
|
||||
}
|
||||
|
||||
@mail_cron = MailCron.new(@mail_cron)
|
||||
|
||||
@mail_cron.save
|
||||
|
||||
MailCron.send_mail_now(@mail_cron.id)
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
def email_group_data
|
||||
|
||||
@email_group_data = Bulletin.email_group_data
|
||||
|
||||
end
|
||||
|
||||
# def get_categorys(id = nil)
|
||||
# @bulletin_categorys = []
|
||||
|
||||
-85
@@ -1,4 +1,3 @@
|
||||
# encoding: utf-8
|
||||
class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
|
||||
include OrbitControllerLib::DivisionForDisable
|
||||
|
||||
@@ -78,9 +77,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
|
||||
# GET /bulletins/new
|
||||
# GET /bulletins/new.xml
|
||||
def new
|
||||
|
||||
email_group_data
|
||||
|
||||
if(session[:in_validate_object].blank?)
|
||||
@bulletin = Bulletin.new(:postdate => DateTime.now)
|
||||
else
|
||||
@@ -98,9 +94,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
|
||||
|
||||
# GET /bulletins/1/edit
|
||||
def edit
|
||||
|
||||
email_group_data
|
||||
|
||||
@bulletin = Bulletin.find(params[:id])
|
||||
if !current_user.admin? && (@bulletin.is_rejected? || @bulletin.is_checked?)
|
||||
redirect_to :action => :index
|
||||
@@ -153,13 +146,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
|
||||
respond_to do |format|
|
||||
if @bulletin.save
|
||||
|
||||
# if @bulletin.email_sent == true && @bulletin.is_checked == true && !@bulletin.is_rejected
|
||||
# send_email_data(@bulletin)
|
||||
|
||||
# @bulletin.email_sent = false
|
||||
# @bulletin.save
|
||||
# end
|
||||
|
||||
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
|
||||
@@ -240,14 +226,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
|
||||
@bulletin.is_rejected = false
|
||||
@bulletin.de_pending!
|
||||
end
|
||||
|
||||
# if @bulletin.email_sent == true && @bulletin.is_checked == true && !@bulletin.is_rejected
|
||||
# send_email_data(@bulletin)
|
||||
|
||||
# @bulletin.email_sent = false
|
||||
# @bulletin.save
|
||||
# end
|
||||
|
||||
# if (params[:bulletin][:is_checked] == "false")
|
||||
# @bulletin.is_rejected = true
|
||||
# @bulletin.save!
|
||||
@@ -315,69 +293,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
|
||||
|
||||
protected
|
||||
|
||||
def send_email_data(bulletin)
|
||||
|
||||
@site = Site.first
|
||||
@user = User.find(bulletin.create_user_id)
|
||||
@host = request.host_with_port
|
||||
|
||||
email_group_data
|
||||
|
||||
@group_mail = Array.new
|
||||
|
||||
bulletin.email_group.each do |egroup|
|
||||
|
||||
if @email_group_data.include?(egroup) and (egroup == '0' or egroup == '1' or egroup == '2' or egroup == '3')
|
||||
|
||||
@group_mail << @email_group_data[egroup]["email"]
|
||||
|
||||
elsif @email_group_data.include?(egroup) and egroup == '4'
|
||||
|
||||
@group_mail << bulletin.other_mailaddress
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
if !@group_mail.join.blank?
|
||||
|
||||
@mail_content = {
|
||||
"host" => @host,
|
||||
"site_title" => @site.title,
|
||||
"title" => bulletin.title,
|
||||
"template" => 'announcement_mailer/cron_mail',
|
||||
"url" => "http://#{@host}#{panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id)}"
|
||||
}
|
||||
|
||||
@mail_cron = {
|
||||
:mail_from_app => 'announcement',
|
||||
:mail_from => @user.email,
|
||||
:mail_reply_to => @user.email,
|
||||
:mail_subject => "#{t("announcement.mail_subject",:site_title => @site.title)}：#{bulletin.title}",
|
||||
:mail_to => @group_mail.join(','),
|
||||
:mail_content => @mail_content ,
|
||||
# :mail_sentdate => bulletin.email_sentdate,
|
||||
:mail_sentdate => DateTime.now,
|
||||
:create_user_id => bulletin.create_user_id,
|
||||
:update_user_id => bulletin.create_user_id
|
||||
}
|
||||
|
||||
@mail_cron = MailCron.new(@mail_cron)
|
||||
|
||||
@mail_cron.save
|
||||
|
||||
MailCron.send_mail_now(@mail_cron.id)
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
def email_group_data
|
||||
|
||||
@email_group_data = Bulletin.email_group_data
|
||||
|
||||
end
|
||||
|
||||
def delete_out_invalid_date_from_params
|
||||
if((params[:bulletin]["deadline(1i)"] && params[:bulletin]["deadline(1i)"].blank?) or (params[:bulletin]["deadline(2i)"] && params[:bulletin]["deadline(2i)"].blank?) or (params[:bulletin]["deadline(3i)"] && params[:bulletin]["deadline(3i)"].blank?))
|
||||
params[:bulletin].delete("deadline(1i)")
|
||||
|
||||
+1
-6
@@ -26,7 +26,6 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
|
||||
end
|
||||
|
||||
def index
|
||||
|
||||
@item = Page.find(params[:page_id]) rescue nil
|
||||
if @item
|
||||
if @item.frontend_data_count
|
||||
@@ -61,11 +60,7 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
|
||||
else
|
||||
@bulletins = Bulletin.all.available_for_lang(I18n.locale).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_main]).per(@page_num)
|
||||
end
|
||||
if params["tag_id"]
|
||||
params["tag_id"].each do |tag_id|
|
||||
delayed_impressionist(Tag.find tag_id) rescue nil
|
||||
end
|
||||
end
|
||||
delayed_impressionist(@tag) if @tag
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
+1
-45
@@ -14,7 +14,7 @@ class Bulletin
|
||||
include OrbitTag::Taggable
|
||||
taggable
|
||||
|
||||
is_impressionable #:counter_cache => { :column_name => :view_count }
|
||||
is_impressionable :counter_cache => { :column_name => :view_count }
|
||||
|
||||
field :title, localize: true
|
||||
field :subtitle, localize: true
|
||||
@@ -40,12 +40,6 @@ class Bulletin
|
||||
field :not_checked_reason
|
||||
|
||||
field :public, :type => Boolean, :default => true
|
||||
|
||||
|
||||
field :email_sent, :type => Boolean, :default => false
|
||||
field :email_sentdate , :type => DateTime
|
||||
field :email_group, :type => Array
|
||||
field :other_mailaddress
|
||||
|
||||
scope :can_display, where(is_checked: true, is_rejected: false, is_pending: false)
|
||||
scope :available_for_lang, ->(locale){ where("available_for_#{locale}".to_sym => true) }
|
||||
@@ -221,46 +215,8 @@ class Bulletin
|
||||
preview_object
|
||||
end
|
||||
|
||||
def get_email_group_data(email_group_data)
|
||||
|
||||
group_mail = Array.new
|
||||
|
||||
self.email_group.each do |egroup|
|
||||
|
||||
if email_group_data.include?(egroup) and (egroup == '0' or egroup == '1' or egroup == '2' or egroup == '3')
|
||||
|
||||
group_mail << "#{email_group_data[egroup]["email"]}(#{email_group_data[egroup]["name"]})"
|
||||
|
||||
elsif email_group_data.include?(egroup) and egroup == '4'
|
||||
|
||||
self.other_mailaddress.split(",").each do |otmail|
|
||||
|
||||
group_mail << "#{otmail}(#{email_group_data[egroup]["name"]})"
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
group_mail.join("<br />").html_safe
|
||||
|
||||
end
|
||||
|
||||
|
||||
protected
|
||||
|
||||
def self.email_group_data
|
||||
|
||||
@email_group_data = {
|
||||
'0'=> {"name"=>I18n.t('announcement.email_group_data_0'), "email"=>"alluser@tea.ntue.edu.tw"},
|
||||
'1'=> {"name"=>I18n.t('announcement.email_group_data_1'), "email"=>"allstu@tea.ntue.edu.tw"},
|
||||
'2'=> {"name"=>I18n.t('announcement.email_group_data_2'), "email"=>"allgrad@tea.ntue.edu.tw"},
|
||||
'3'=> {"name"=>I18n.t('announcement.email_group_data_3'), "email"=>"allad@tea.ntue.edu.tw"},
|
||||
'4'=> {"name"=>I18n.t('announcement.email_group_data_4')}
|
||||
}
|
||||
|
||||
end
|
||||
|
||||
def check_deadline
|
||||
if(!self.deadline.nil? and (self.deadline < self.postdate ))
|
||||
|
||||
-29
@@ -1,29 +0,0 @@
|
||||
<% # encoding: utf-8 %>
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
|
||||
</head>
|
||||
<body bgcolor="#FFFFFF">
|
||||
<div style="text-ident:20px">
|
||||
</div>
|
||||
|
||||
<%= t('announcement.mail_hi') %> <br /><br />
|
||||
<%= t('announcement.mail_url_view') %> <br /><br />
|
||||
<a href="<%= @data.mail_content["url"] %>" target="_blank"> <%= @data.mail_content["title"] %> </a> <br /><br />
|
||||
</div>
|
||||
<span style="color:#555">--<br />
|
||||
<%= t('announcement.mail_source') %> ：<a href="http://<%= @data.mail_content["host"] %>" target="_blank"> <%= @data.mail_content["site_title"] %> </a><br />
|
||||
<%= t('announcement.mail_time') %> <%= DateTime.now %>
|
||||
</span>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
-6
@@ -14,12 +14,6 @@
|
||||
<%# preview_block_ad_images_helper(bulletin).each do |ad_image| -%>
|
||||
<%#= image_tag ad_image.file,:alt => (ad_image.title[locale] || " "),:time_to_next => bulletin.transition_msec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || bulletin.context || " ")) %>
|
||||
<%# end -%>
|
||||
|
||||
<% if !@bulletin.email_group.blank? %>
|
||||
<%= label_tag 'group_mail' %>
|
||||
<%= @bulletin.get_email_group_data(@email_group_data) %>
|
||||
<% end %>
|
||||
|
||||
</p>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
|
||||
Vendored
-49
@@ -265,50 +265,6 @@
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div id="widget" class="widget-box">
|
||||
<div class="widget-action clear">
|
||||
<a class="action"><i title="Added to the file" class="icon-exclamation-sign icon-white tip"></i></a>
|
||||
</div>
|
||||
<h3 class="widget-title"><i class="icons-bell"></i><%= t('announcement.email_eminder')%></h3>
|
||||
<div class="widget-content">
|
||||
<div class="controls">
|
||||
<label class="checkbox inline"><input id="remind-check" type="checkbox" value="1" name="bulletin[email_sent]"><%= t('announcement.activate_email_eminder')%></label>
|
||||
<div id="content-box">
|
||||
<hr />
|
||||
|
||||
<%#= f.datetime_picker :email_sentdate, :picker_type => 'separated', :label => t("announcement.email_sentdate") %>
|
||||
|
||||
<br />
|
||||
|
||||
<%= f.label :email_group ,t("announcement.email_group")%>
|
||||
<div class="form-inline">
|
||||
<ul class="nav nav-pills">
|
||||
<% @email_group_data.collect do |k,v| %>
|
||||
<li class="pull-left">
|
||||
<%= check_box_tag 'bulletin[email_group][]', k, (@bulletin.email_group.nil? ? false : @bulletin.email_group.include?(k)), :id => "field-#{k}" %>
|
||||
<label for="field-<%= k %>"><%= v["name"] %></label>
|
||||
<%= hidden_field_tag 'bulletin[email_group][]', '' %>
|
||||
</li>
|
||||
<% end %>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
||||
<%= f.label :other_mailaddress ,"#{t("announcement.other_mailaddress")}(#{t("announcement.other_mailaddress_note")})"%>
|
||||
<%= f.text_area :other_mailaddress, :class=>"span12", :cols=>"25", :rows=>"10" %>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@@ -344,11 +300,6 @@
|
||||
$(this).parents('table').append(("<%= escape_javascript(add_attribute 'form_bulletin_file', f, :bulletin_files) %>").replace(old_id, new_id));
|
||||
});
|
||||
$('.for_preview').popover({ html : true });
|
||||
|
||||
$('#remind-check').prop('checked') ? '':$('#content-box').addClass('hide')
|
||||
$('#remind-check').on('change', function() {
|
||||
$(this).prop('checked') ? $('#content-box').removeClass('hide'):$('#content-box').addClass('hide')
|
||||
})
|
||||
});
|
||||
</script>
|
||||
<% end %>
|
||||
+1
-19
@@ -16,7 +16,6 @@ en:
|
||||
bulletin_category_with_title: Bulletin Category with Title
|
||||
postdate: Post Date
|
||||
title: Title
|
||||
subtitle: SubTitle
|
||||
editing_announcement: Edit Announcement
|
||||
editing_announcement_category: Edit Category
|
||||
error:
|
||||
@@ -37,21 +36,4 @@ en:
|
||||
widget:
|
||||
bulletins_and_web_links: Bulletins and Web Resources
|
||||
index: Index
|
||||
search: Search
|
||||
email_eminder: Email Reminder
|
||||
activate_email_eminder: Activate Email Reminder
|
||||
email_sentdate: Email Time
|
||||
email_group: Email Group
|
||||
email_group_data_0: All Faculty
|
||||
email_group_data_1: Undergraduates
|
||||
email_group_data_2: Postgraduates
|
||||
email_group_data_3: Continuing Ed. Postgraduates
|
||||
email_group_data_4: Other
|
||||
mail_subject: this is an announcement reminder from【%{site_title}】
|
||||
other_mailaddress: Other Email
|
||||
other_mailaddress_note: Divide different email accounts with ","
|
||||
mail_hi: Hi
|
||||
mail_url_view: This email is the reminder of an announcement, please click the link for the details
|
||||
mail_source: Source
|
||||
mail_time: Time
|
||||
|
||||
search: Search
|
||||
@@ -16,7 +16,6 @@ zh_tw:
|
||||
bulletin_category_with_title: 公告類別及標題
|
||||
postdate: 張貼日期
|
||||
title: 標題
|
||||
subtitle: 副標題
|
||||
editing_announcement: 編輯類別
|
||||
editing_announcement_category: 編輯類別
|
||||
error:
|
||||
@@ -37,22 +36,4 @@ zh_tw:
|
||||
widget:
|
||||
bulletins_and_web_links: 索引
|
||||
index: 索引
|
||||
search: 搜尋
|
||||
email_eminder: 寄送提醒
|
||||
activate_email_eminder: 開啟寄送提醒
|
||||
email_sentdate: 寄送時間
|
||||
email_group: 寄送群組
|
||||
other_mailaddress: 其他Mail
|
||||
other_mailaddress_note: 輸入多組mail時,請用","逗號隔開
|
||||
email_group_data_0: 全校教職員
|
||||
email_group_data_1: 大學部學生
|
||||
email_group_data_2: 日間部研究生
|
||||
email_group_data_3: 進修部研究生
|
||||
email_group_data_4: 其他
|
||||
mail_subject: 來自【%{site_title}】的公告事件提醒
|
||||
mail_hi: 您好
|
||||
mail_url_view: 此封信件為公告事件提醒，請點選以下連結詳細觀看
|
||||
mail_source: 來源
|
||||
mail_time: 時間
|
||||
|
||||
|
||||
search: 搜尋
|
||||
+3
-4
@@ -23,19 +23,18 @@ module Announcement
|
||||
end
|
||||
|
||||
category ["BulletinCategory"]
|
||||
data_count 1..10
|
||||
data_count 3..10
|
||||
|
||||
taggable
|
||||
|
||||
widgets do
|
||||
default_widget do
|
||||
query 'Bulletin.any_of( {deadline: nil,:postdate.lte => Time.now} , {:deadline.gte => Time.now,:postdate.lte => Time.now} )'
|
||||
enable ["typeA","typeB_style3","typeC"]
|
||||
enable ["typeA","typeC"]
|
||||
image :image
|
||||
field :postdate
|
||||
link_field :title,{:method => 'panel_announcement_front_end_bulletin_path',:args=>:self,:preview=>true}
|
||||
link_field :title,{:method => 'panel_announcement_front_end_bulletin_path',:args=>:self}
|
||||
link_field :bulletin_category_with_title,{:method => 'panel_announcement_front_end_bulletins_path',:args=>{:category_id => [:bulletin_category,:id]}}
|
||||
field :subtitle
|
||||
link_to_more 'panel_announcement_front_end_bulletins_path',:title_i18n=> 'more_plus'
|
||||
end
|
||||
|
||||
|
||||
+4
-44
@@ -1,18 +1,14 @@
|
||||
class Panel::Archive::BackEnd::ArchiveFileCategorysController < OrbitBackendController
|
||||
include OrbitControllerLib::DivisionForDisable
|
||||
class Panel::Archive::BackEnd::ArchiveFileCategorysController < OrbitBackendController
|
||||
before_filter :for_app_manager,:except => [:index]
|
||||
include OrbitControllerLib::DivisionForDisable
|
||||
|
||||
before_filter :for_app_manager,:except => [:index,:get_categorys_json,:get_archive_files_json]
|
||||
|
||||
before_filter :force_order_for_visitor,:only=>[:index,:get_categorys_json,:get_archive_files_json]
|
||||
before_filter :force_order_for_user,:except => [:index,:get_categorys_json,:get_archive_files_json]
|
||||
before_filter :for_app_sub_manager,:except => [:index,:get_categorys_json,:get_archive_files_json]
|
||||
|
||||
def index
|
||||
@archive_file_categorys = get_categories_for_index("ArchiveFileCategory")
|
||||
# @archive_file_categorys = ArchiveFileCategory.all
|
||||
@archive_file_category = ArchiveFileCategory.new(:display => 'List')
|
||||
|
||||
@url = panel_archive_back_end_archive_file_categorys_path
|
||||
@url = panel_archive_back_end_archive_file_categorys_path
|
||||
|
||||
respond_to do |format|
|
||||
format.html # index.html.erb
|
||||
@@ -20,42 +16,6 @@ class Panel::Archive::BackEnd::ArchiveFileCategorysController < OrbitBackendCont
|
||||
end
|
||||
end
|
||||
|
||||
def get_categorys_json
|
||||
categorys = ArchiveFileCategory.all
|
||||
data = Array.new
|
||||
|
||||
categorys.each do |c|
|
||||
data << {
|
||||
category: c.title,
|
||||
link: "#{url_for( :action => "index",
|
||||
:controller => "panel/archive/front_end/archive_files",
|
||||
:format => :rss,
|
||||
:only_path => false,
|
||||
:inner=>true,
|
||||
:category_id => c )}"
|
||||
}
|
||||
end
|
||||
|
||||
render :json => JSON.pretty_generate(data)
|
||||
end
|
||||
|
||||
def get_archive_files_json
|
||||
archive_file = ArchiveFileCategory.find(params[:archive_file_category_id]).archive_files
|
||||
p archive_file
|
||||
data = Array.new
|
||||
|
||||
archive_file.each do |b|
|
||||
|
||||
data << {
|
||||
title: b.title,
|
||||
link: "http://#{request.host_with_port}#{panel_archive_front_end_archive_file_path(b, :category_id => b.archive_file_category.id)}",
|
||||
tag: b.sorted_tags.to_a,
|
||||
}
|
||||
end
|
||||
|
||||
render :json => JSON.pretty_generate(data)
|
||||
end
|
||||
|
||||
# GET /archive_files/1
|
||||
# GET /archive_files/1.xml
|
||||
def show
|
||||
|
||||
Vendored
-15
@@ -1,15 +0,0 @@
|
||||
module Panel::Archive::BackEnd::ArchiveFileCategorysHelper
|
||||
include ActionView::Helpers::UrlHelper
|
||||
|
||||
|
||||
def show_anc_cate_permission_link(archive_file_category)
|
||||
type = 'submit'
|
||||
oa = archive_file_category.get_object_auth_by_title(type)
|
||||
if oa.nil?
|
||||
archive_file_category.object_auths.new(title: type ).save
|
||||
oa = archive_file_category.get_object_auth_by_title(type)
|
||||
end
|
||||
link_to t(:category_auth),admin_object_auth_ob_auth_path(oa)
|
||||
end
|
||||
|
||||
end
|
||||
+3
-6
@@ -1,16 +1,13 @@
|
||||
|
||||
|
||||
<tr id="<%= dom_id archive_file_category %>" class="with_action">
|
||||
<td>
|
||||
<%= archive_file_category.key %>
|
||||
<div class="quick-edit">
|
||||
<ul class="nav nav-pills hide">
|
||||
<% if is_admin?%>
|
||||
<li><%= link_to t(:edit), edit_panel_archive_back_end_archive_file_category_path(archive_file_category), :remote => true %></li>
|
||||
<li><%= link_to t('archive_file_category.edit'), edit_panel_archive_back_end_archive_file_category_path(archive_file_category), :remote => true %></li>
|
||||
<li><%= link_to show_toggle_archive_btn(archive_file_category) , panel_archive_back_end_archive_file_category_path(archive_file_category), :confirm => t(:sure?), :method => :delete, :remote => true,:class=> "archive_toggle" %></li>
|
||||
<% end %>
|
||||
<%if is_manager? || is_admin? %>
|
||||
<li><%= show_anc_cate_permission_link(archive_file_category) %></li>
|
||||
<% end %>
|
||||
<!-- <li><%#= link_to t('archive_file_category.delete'), panel_archive_back_end_archive_file_category_path(archive_file_category), :confirm => t('sure?'), :method => :delete, :remote => true %></li> -->
|
||||
</ul>
|
||||
</div>
|
||||
</td>
|
||||
|
||||
+9
-10
@@ -24,17 +24,16 @@
|
||||
</td>
|
||||
<td><%= archive_file.archive_file_category.title %></td>
|
||||
<td>
|
||||
<%= link_to archive_file.title, panel_archive_front_end_archive_file_path(archive_file) %>
|
||||
|
||||
<div class="quick-edit">
|
||||
<ul class="nav nav-pills hide">
|
||||
<% if (archive_file.create_user_id == current_or_guest_user.id) || is_manager? %>
|
||||
<li><%= link_to t(:edit), edit_panel_archive_back_end_archive_file_path(archive_file) %></li>
|
||||
<li class="dropdown"><%= link_to t(:delete_), panel_archive_back_end_archive_file_path(archive_file), :confirm => t(:sure?), :method => :delete, :remote => true %></li>
|
||||
<% end -%>
|
||||
</ul>
|
||||
</div>
|
||||
<%= link_to archive_file.title, panel_archive_front_end_archive_file_path(archive_file) %>
|
||||
|
||||
<div class="quick-edit">
|
||||
<ul class="nav nav-pills hide">
|
||||
<%if at_least_module_manager || archive_file.archive_file_category.cur_user_is_sub_manager_of(:edit)%>
|
||||
<li><%= link_to t('edit'), edit_panel_archive_back_end_archive_file_path(archive_file, :page => params[:page], :filter => @filter) %></li>
|
||||
<li><%= link_to t(:delete_), panel_archive_back_end_archive_file_path(archive_file), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
|
||||
<% end -%>
|
||||
</ul>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="label-group">
|
||||
|
||||
+3
-8
@@ -50,7 +50,7 @@ module Archive
|
||||
head_label_i18n 'archive.archive',:icon_class=>"icons-archive"
|
||||
available_for [:admin,:guest,:manager,:sub_manager]
|
||||
active_for_controllers ({:private=>['archive_file_categorys','archive_files'],:public=>['panel/archive/back_end/tags']})
|
||||
active_for_object_auth ['ArchiveFileCategory']
|
||||
# active_for_object_auth ['BulletinCategory']
|
||||
|
||||
head_link_path "panel_archive_back_end_archive_files_path"
|
||||
|
||||
@@ -64,7 +64,7 @@ module Archive
|
||||
:link_path=>"new_panel_archive_back_end_archive_file_path" ,
|
||||
:priority=>2,
|
||||
:active_for_action=>{:archive_files=>:new},
|
||||
:available_for => [:sub_manager]
|
||||
:available_for => [:admin]
|
||||
|
||||
context_link 'categories',
|
||||
:link_path=>"panel_archive_back_end_archive_file_categorys_path" ,
|
||||
@@ -76,12 +76,7 @@ module Archive
|
||||
:link_path=>"admin_tags_path(:module_app_id => ModuleApp.first(conditions: {title: 'Archive'}))" ,
|
||||
:priority=>4,
|
||||
# :active_for_action=>{:bulletin_categorys=>:index},
|
||||
:available_for => [:manager]
|
||||
|
||||
context_link 'module_authorization',
|
||||
:link_path=>"admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {title: 'Archive'}))",
|
||||
:priority=>6,
|
||||
:active_for_app_auth => 'Archive'
|
||||
:available_for => [:admin]
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
+2
-11
@@ -51,14 +51,7 @@ var calendarAPI = function(){
|
||||
// c.loadMonthView(c.cur_month,c.cur_year);
|
||||
// c.loadWeekView(c.cur_week,c.cur_year);
|
||||
// c.loadDayView(c.cur_date,c.cur_month,c.cur_year);
|
||||
agenda_end_month = c.cur_month + 5;
|
||||
agenda_end_year = c.cur_year;
|
||||
if(agenda_end_month > 12){
|
||||
agenda_end_month = agenda_end_month - 12;
|
||||
agenda_end_year++;
|
||||
}
|
||||
|
||||
c.loadAgendaView(c.cur_month,c.cur_year,agenda_end_month,agenda_end_year);
|
||||
c.loadAgendaView();
|
||||
$(".calendar-filter-btn").each(function(){
|
||||
c.calendars.push($(this).attr("href"));
|
||||
})
|
||||
@@ -137,7 +130,7 @@ var calendarAPI = function(){
|
||||
c.loadDayView(c.cur_date,c.cur_month,c.cur_year);
|
||||
break;
|
||||
case 'agenda':
|
||||
c.loadAgendaView(c.cur_month,c.cur_year,agenda_end_month,agenda_end_year);
|
||||
c.loadAgendaView();
|
||||
break;
|
||||
}
|
||||
})
|
||||
@@ -598,8 +591,6 @@ var calendarAPI = function(){
|
||||
this.loadAgendaView = function(start_month,start_year,end_month,end_year){
|
||||
c.view = "agenda";
|
||||
var url = "cals/agenda_view";
|
||||
$(".mode_switch").removeClass("active");
|
||||
$(".mode_switch:eq(3)").addClass("active");
|
||||
if(start_month && start_year && end_month && end_year)
|
||||
var url = "cals/agenda_view?s_month="+start_month+"&s_year="+start_year+"&e_month="+end_month+"&e_year="+end_year ;
|
||||
|
||||
|
||||
Vendored
+3
-4
@@ -190,8 +190,7 @@ class Panel::Calendar::BackEnd::CalsController < OrbitBackendController
|
||||
end
|
||||
display_time = est + " " + event.start_am_pm + " - " + eet + " " + event.end_am_pm
|
||||
end
|
||||
|
||||
for c in start_date..(start_date + no_of_days - 1)
|
||||
for c in start_date..(start_date + no_of_days)
|
||||
if h.index(c) == nil
|
||||
h << c
|
||||
end
|
||||
@@ -297,7 +296,7 @@ class Panel::Calendar::BackEnd::CalsController < OrbitBackendController
|
||||
year = params[:year].to_i
|
||||
fromcalendars = params[:calendars]
|
||||
@d = getWeekDataSet(week,year)
|
||||
events = Event.where(:cal_id.in=>fromcalendars).and(:start_week.lte => week).and(:start_year => year).and(:end_week.gte => week).asc(:start_week).asc(:start_date)
|
||||
events = Event.where(:cal_id.in=>fromcalendars).and(:start_week.lte => week).and(:start_year => year).and(:end_week.gte => week).and(:start_year => year).asc(:start_week).asc(:start_date)
|
||||
@events = Array.new
|
||||
events.each_with_index do |event,i|
|
||||
# @temp = Array.new
|
||||
@@ -336,7 +335,7 @@ class Panel::Calendar::BackEnd::CalsController < OrbitBackendController
|
||||
startdt = @d[0].to_i
|
||||
event.all_day = true
|
||||
if event.end_week == week
|
||||
colcount = @d.index(event.end_date.to_s).to_i + 1
|
||||
colcount = 7 - @d.index(event.end_date.to_s).to_i
|
||||
days = 7;
|
||||
startdt = event.start_date
|
||||
end
|
||||
|
||||
Vendored
+4
-17
@@ -71,11 +71,8 @@ class Panel::Calendar::BackEnd::EventsController < OrbitBackendController
|
||||
start_am_pm = params[:start_am_pm]
|
||||
end_am_pm = params[:end_am_pm]
|
||||
|
||||
if params[:event][:cal_id]
|
||||
cal_id = params[:event][:cal_id]
|
||||
else
|
||||
cal_id = Cal.first.id.to_s
|
||||
end
|
||||
cal_id = params[:event][:cal_id]
|
||||
|
||||
# if start_am_pm == "PM"
|
||||
# temp_start_time = $starttime + 12
|
||||
# end
|
||||
@@ -93,9 +90,7 @@ class Panel::Calendar::BackEnd::EventsController < OrbitBackendController
|
||||
final_start_time = Date.new(start_year.to_i,start_month.to_i,start_date.to_i)
|
||||
final_end_time = Date.new(end_year.to_i,end_month.to_i,end_date.to_i)
|
||||
start_week = final_start_time.strftime("%U")
|
||||
start_week = start_week.to_i + 1
|
||||
end_week = final_end_time.strftime("%U")
|
||||
end_week = end_week.to_i + 1
|
||||
end_week = final_end_time.strftime("%U")
|
||||
total_days = final_end_time - final_start_time
|
||||
@event = Event.new
|
||||
@event.title = title
|
||||
@@ -155,12 +150,6 @@ class Panel::Calendar::BackEnd::EventsController < OrbitBackendController
|
||||
# if end_am_pm == "PM"
|
||||
# temp_end_time = $endtime + 12
|
||||
# end
|
||||
if params[:event][:cal_id]
|
||||
cal_id = params[:event][:cal_id]
|
||||
else
|
||||
cal_id = Cal.first.id.to_s
|
||||
end
|
||||
|
||||
if params[:all_day]
|
||||
all_day = true
|
||||
$starttime = 0
|
||||
@@ -172,9 +161,7 @@ class Panel::Calendar::BackEnd::EventsController < OrbitBackendController
|
||||
final_start_time = Date.new(start_year.to_i,start_month.to_i,start_date.to_i)
|
||||
final_end_time = Date.new(end_year.to_i,end_month.to_i,end_date.to_i)
|
||||
start_week = final_start_time.strftime("%U")
|
||||
start_week = start_week.to_i + 1
|
||||
end_week = final_end_time.strftime("%U")
|
||||
end_week = end_week.to_i + 1
|
||||
end_week = final_end_time.strftime("%U")
|
||||
total_days = final_end_time - final_start_time
|
||||
@event = Event.find(params[:id])
|
||||
@event.title = title
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
.bundle/
|
||||
log/*.log
|
||||
pkg/
|
||||
test/dummy/db/*.sqlite3
|
||||
test/dummy/log/*.log
|
||||
test/dummy/tmp/
|
||||
test/dummy/.sass-cache
|
||||
-17
@@ -1,17 +0,0 @@
|
||||
source "http://rubygems.org"
|
||||
|
||||
# Declare your gem's dependencies in er_email.gemspec.
|
||||
# Bundler will treat runtime dependencies like base dependencies, and
|
||||
# development dependencies will be added by default to the :development group.
|
||||
gemspec
|
||||
|
||||
# jquery-rails is used by the dummy application
|
||||
gem "jquery-rails"
|
||||
|
||||
# Declare any dependencies that are still in development here instead of in
|
||||
# your gemspec. These might include edge Rails or gems from your path or
|
||||
# Git. Remember to move these dependencies to your gemspec before releasing
|
||||
# your gem to rubygems.org.
|
||||
|
||||
# To use debugger
|
||||
# gem 'debugger'
|
||||
-20
@@ -1,20 +0,0 @@
|
||||
Copyright 2013 YOURNAME
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of this software and associated documentation files (the
|
||||
"Software"), to deal in the Software without restriction, including
|
||||
without limitation the rights to use, copy, modify, merge, publish,
|
||||
distribute, sublicense, and/or sell copies of the Software, and to
|
||||
permit persons to whom the Software is furnished to do so, subject to
|
||||
the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be
|
||||
included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
@@ -1,3 +0,0 @@
|
||||
= ErEmail
|
||||
|
||||
This project rocks and uses MIT-LICENSE.
|
||||
-40
@@ -1,40 +0,0 @@
|
||||
#!/usr/bin/env rake
|
||||
begin
|
||||
require 'bundler/setup'
|
||||
rescue LoadError
|
||||
puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
|
||||
end
|
||||
begin
|
||||
require 'rdoc/task'
|
||||
rescue LoadError
|
||||
require 'rdoc/rdoc'
|
||||
require 'rake/rdoctask'
|
||||
RDoc::Task = Rake::RDocTask
|
||||
end
|
||||
|
||||
RDoc::Task.new(:rdoc) do |rdoc|
|
||||
rdoc.rdoc_dir = 'rdoc'
|
||||
rdoc.title = 'ErEmail'
|
||||
rdoc.options << '--line-numbers'
|
||||
rdoc.rdoc_files.include('README.rdoc')
|
||||
rdoc.rdoc_files.include('lib/**/*.rb')
|
||||
end
|
||||
|
||||
APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
|
||||
load 'rails/tasks/engine.rake'
|
||||
|
||||
|
||||
|
||||
Bundler::GemHelper.install_tasks
|
||||
|
||||
require 'rake/testtask'
|
||||
|
||||
Rake::TestTask.new(:test) do |t|
|
||||
t.libs << 'lib'
|
||||
t.libs << 'test'
|
||||
t.pattern = 'test/**/*_test.rb'
|
||||
t.verbose = false
|
||||
end
|
||||
|
||||
|
||||
task :default => :test
|
||||
Whitespace-only changes.
Whitespace-only changes.
Whitespace-only changes.
Whitespace-only changes.
@@ -1,23 +0,0 @@
|
||||
class ApplicationController < ActionController::Base
|
||||
protect_from_forgery
|
||||
before_filter :set_locale
|
||||
|
||||
# Set I18n.locale
|
||||
def set_locale
|
||||
# update session if passed
|
||||
session[:locale] = params[:locale] if params[:locale]
|
||||
|
||||
# set locale based on session or default
|
||||
begin
|
||||
# check if locale is valid for non site pages
|
||||
if !VALID_LOCALES.include?(session[:locale])
|
||||
I18n.locale = I18n.default_locale
|
||||
else
|
||||
I18n.locale = session[:locale]
|
||||
end
|
||||
rescue
|
||||
I18n.locale = I18n.default_locale
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
Vendored
-145
@@ -1,145 +0,0 @@
|
||||
class Panel::ErEmail::BackEnd::ApprovalsController < OrbitBackendController
|
||||
before_filter :authenticate_user!
|
||||
before_filter :is_admin?
|
||||
include AdminHelper
|
||||
# layout 'admin'
|
||||
|
||||
|
||||
def preview_and_approve
|
||||
email_group_data
|
||||
@email_er = EmailEr.find params[:email_er_id]
|
||||
end
|
||||
|
||||
def approve
|
||||
notice = ""
|
||||
@email_er = EmailEr.find params[:email_er_id]
|
||||
@email_er.proc_check(params[:email_er][:is_checked],params[:email_er][:not_checked_reason])
|
||||
@email_er.de_pending
|
||||
if @email_er.save
|
||||
|
||||
if @email_er.is_checked == true and !@email_er.is_rejected
|
||||
send_email_data(@email_er)
|
||||
end
|
||||
|
||||
notice = t('er_email.approve_email_er_success')
|
||||
else
|
||||
notice = t('er_email.approve_email_er_fail')
|
||||
end
|
||||
redirect_to(panel_er_email_back_end_email_ers_url,:notice => notice)
|
||||
end
|
||||
|
||||
def setting
|
||||
@sys_users = User.all(conditions: {admin: false}).includes(:avatar).not_guest_user
|
||||
@email_er_categorys = EmailErCategory.all
|
||||
@options_from_collection_for_select_email_er_categorys = @email_er_categorys.collect{|bc| [bc.title,bc.id] }
|
||||
if params.has_key? :category
|
||||
@email_er_category = EmailErCategory.find params[:category][:id]
|
||||
else
|
||||
@email_er_category = @email_er_categorys.first
|
||||
end
|
||||
preload_object_auth = @email_er_category.get_object_auth_by_title('fact_check')
|
||||
@users_array = preload_object_auth.privilege_users rescue []
|
||||
respond_to do |format|
|
||||
format.html
|
||||
format.js
|
||||
end
|
||||
end
|
||||
|
||||
def update_setting
|
||||
object_auth = update_setting_by_params
|
||||
if object_auth.save!
|
||||
flash[:notice] = t('update.success_')
|
||||
else
|
||||
flash[:notice] = t('update.fail')
|
||||
end
|
||||
end
|
||||
|
||||
def user_list
|
||||
@email_er_category = EmailErCategory.find params[:category][:id]
|
||||
end
|
||||
|
||||
protected
|
||||
def update_setting_by_params
|
||||
category = EmailErCategory.find params[:category][:id]
|
||||
privilege_users = params[:users].collect{|key,value| User.find key } rescue []
|
||||
object_auth_ary = category.object_auths.where(title: 'fact_check') || (category.object_auths.create :title=> 'fact_check')
|
||||
object_auth = object_auth_ary.first
|
||||
object_auth.privilege_users = privilege_users
|
||||
object_auth
|
||||
end
|
||||
|
||||
def send_email_data(email_er)
|
||||
|
||||
@user = User.find(email_er.create_user_id)
|
||||
|
||||
email_group_data
|
||||
|
||||
@group_mail = Array.new
|
||||
|
||||
email_er.email_group.each do |egroup|
|
||||
|
||||
if @email_group_data.include?(egroup) and (egroup == '0' or egroup == '1' or egroup == '2' or egroup == '3')
|
||||
|
||||
@group_mail << @email_group_data[egroup]["email"]
|
||||
|
||||
elsif @email_group_data.include?(egroup) and egroup == '4'
|
||||
|
||||
@group_mail << email_er.other_mailaddress
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
if !@group_mail.join.blank?
|
||||
|
||||
@mail_content = {
|
||||
"text" => email_er.mail_content
|
||||
}
|
||||
|
||||
@mail_cron = {
|
||||
:mail_from_app => 'er_email',
|
||||
:mail_from => @user.email,
|
||||
:mail_reply_to => @user.email,
|
||||
:mail_subject => email_er.mail_subject,
|
||||
:mail_to => @group_mail.join(','),
|
||||
:mail_content => @mail_content ,
|
||||
# :mail_sentdate => email_er.mail_sentdate,
|
||||
:mail_sentdate => DateTime.now,
|
||||
:create_user_id => email_er.create_user_id,
|
||||
:update_user_id => email_er.create_user_id
|
||||
}
|
||||
|
||||
@mail_cron = MailCron.new(@mail_cron)
|
||||
|
||||
email_er.email_er_files.each do | mrfile |
|
||||
|
||||
@mcfile = @mail_cron.mail_cron_files.build
|
||||
|
||||
tmp_file = File.new(mrfile.file_identifier, 'w+')
|
||||
|
||||
tmp_file.write(Mongo::GridFileSystem.new(Mongoid.database).open(mrfile.file.url.gsub("/gridfs/", ""), 'r').read.force_encoding("UTF-8"))
|
||||
|
||||
@mcfile.file = tmp_file
|
||||
|
||||
@mcfile.title = mrfile.title
|
||||
|
||||
# delete file
|
||||
FileUtils.rm_f(tmp_file)
|
||||
|
||||
end
|
||||
|
||||
@mail_cron.save
|
||||
|
||||
MailCron.send_mail_now(@mail_cron.id)
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
def email_group_data
|
||||
|
||||
@email_group_data = EmailEr.email_group_data
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
-128
@@ -1,128 +0,0 @@
|
||||
class Panel::ErEmail::BackEnd::EmailErCategorysController < OrbitBackendController
|
||||
include OrbitControllerLib::DivisionForDisable
|
||||
|
||||
before_filter :for_app_manager,:except => [:index,:get_categorys_json]
|
||||
before_filter :force_order_for_visitor,:only=>[:index,:get_categorys_json]
|
||||
before_filter :force_order_for_user,:except => [:index,:get_categorys_json]
|
||||
before_filter :for_app_sub_manager,:except => [:index,:get_categorys_json]
|
||||
|
||||
|
||||
def index
|
||||
@email_er_categorys = get_categories_for_index("EmailErCategory")
|
||||
@email_er_category = EmailErCategory.new(:display => 'List')
|
||||
|
||||
@url = panel_er_email_back_end_email_er_categorys_path
|
||||
|
||||
respond_to do |format|
|
||||
format.html # index.html.erb
|
||||
format.js
|
||||
end
|
||||
end
|
||||
|
||||
def get_categorys_json
|
||||
categorys = EmailErCategory.all
|
||||
data = Array.new
|
||||
|
||||
categorys.each do |c|
|
||||
data << {
|
||||
category: c.title,
|
||||
link: "#{url_for( :action => "index",
|
||||
:controller => "panel/er_email/back_end/email_ers",
|
||||
:format => :rss,
|
||||
:only_path => false,
|
||||
:inner=>true,
|
||||
:category_id => c )}"
|
||||
}
|
||||
end
|
||||
render :json => JSON.pretty_generate(data)
|
||||
end
|
||||
|
||||
# GET /email_ers/1
|
||||
# GET /email_ers/1.xml
|
||||
def show
|
||||
@email_er_category = EmailErCategory.find(params[:id])
|
||||
|
||||
respond_to do |format|
|
||||
format.html # show.html.erb
|
||||
format.js
|
||||
end
|
||||
end
|
||||
|
||||
# GET /email_ers/new
|
||||
# GET /email_ers/new.xml
|
||||
def new
|
||||
@email_er_category = EmailErCategory.new(:display => 'List')
|
||||
|
||||
respond_to do |format|
|
||||
format.html # new.html.erb
|
||||
format.js
|
||||
end
|
||||
end
|
||||
|
||||
# GET /email_ers/1/edit
|
||||
def edit
|
||||
@email_er_category = EmailErCategory.find(params[:id])
|
||||
|
||||
@url = panel_er_email_back_end_email_er_category_path(@email_er_category)
|
||||
|
||||
respond_to do |format|
|
||||
format.html
|
||||
format.js
|
||||
end
|
||||
end
|
||||
|
||||
# POST /email_ers
|
||||
# POST /email_ers.xml
|
||||
def create
|
||||
@email_er_category = EmailErCategory.new(params[:email_er_category])
|
||||
|
||||
respond_to do |format|
|
||||
if @email_er_category.save
|
||||
format.html { redirect_to(panel_er_email_back_end_email_er_categorys_url, :notice => t('email_er_category.create_email_er_category_success')) }
|
||||
format.js
|
||||
else
|
||||
format.html { render :action => "new" }
|
||||
format.js { render action: "new" }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# PUT /email_ers/1
|
||||
# PUT /email_ers/1.xml
|
||||
def update
|
||||
@email_er_category = EmailErCategory.find(params[:id])
|
||||
|
||||
@url = panel_er_email_back_end_email_er_category_path(@email_er_category)
|
||||
|
||||
respond_to do |format|
|
||||
if @email_er_category.update_attributes(params[:email_er_category])
|
||||
format.html { redirect_to(panel_er_email_back_end_email_er_categorys_url, :notice => t('email_er_category.update_email_er_category_success')) }
|
||||
# format.xml { head :ok }
|
||||
format.js
|
||||
else
|
||||
format.html { render :action => "edit" }
|
||||
format.js { render :action => "edit" }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# DELETE /email_ers/1
|
||||
# DELETE /email_ers/1.xml
|
||||
def destroy
|
||||
@email_er_category = EmailErCategory.find(params[:id])
|
||||
@email_er_category.disable = @email_er_category.disable ? false : true
|
||||
|
||||
if @email_er_category.save!
|
||||
respond_to do |format|
|
||||
flash[:notice] = t("update.success_")
|
||||
# flash[:error] += @email_er_category.disable ? t(:enable) : t(disable)
|
||||
format.html { redirect_to(panel_er_email_back_end_email_er_categorys_url) }
|
||||
# format.xml { head :ok }
|
||||
format.js
|
||||
end
|
||||
else
|
||||
flash[:error] = t("update.fail")
|
||||
format.html { render :action => "index" }
|
||||
end
|
||||
end
|
||||
end
|
||||
Vendored
-318
@@ -1,318 +0,0 @@
|
||||
class Panel::ErEmail::BackEnd::EmailErsController < OrbitBackendController
|
||||
# before_filter :for_app_manager,:except => [:index,:show]
|
||||
include OrbitControllerLib::DivisionForDisable
|
||||
|
||||
|
||||
before_filter :force_order_for_user
|
||||
|
||||
|
||||
before_filter :only => [ :new,:edit,:update,:create] do |controller|
|
||||
controller.get_categorys('EmailErCategory')
|
||||
end
|
||||
|
||||
def preview
|
||||
email_er = EmailEr.new params
|
||||
@preview_obj = email_er.to_preview
|
||||
@preview_obj.save
|
||||
render '/shared/preview/preview.html.erb',:layout=>false
|
||||
end
|
||||
|
||||
def index
|
||||
|
||||
get_categorys("EmailErCategory",params[:email_er_category_id])
|
||||
|
||||
email_group_data
|
||||
|
||||
@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
|
||||
|
||||
@email_er_categories = get_categories_for_index("EmailErCategory")
|
||||
@email_er_category_ids = @email_er_categories.collect{|t| t.id.to_s} + [nil]
|
||||
|
||||
@email_ers = (params[:sort] || @filter) ? get_sorted_and_filtered("email_er",:email_er_category_id.in => @email_er_category_ids) : get_viewable("email_er",:email_er_category_id.in => @email_er_category_ids)
|
||||
|
||||
respond_to do |format|
|
||||
format.html # index.html.erb
|
||||
format.xml { render :xml => @email_ers }
|
||||
format.js
|
||||
end
|
||||
end
|
||||
|
||||
# GET /email_ers/1
|
||||
# GET /email_ers/1.xml
|
||||
|
||||
def show
|
||||
|
||||
email_group_data
|
||||
|
||||
@item = Page.find(params[:page_id]) rescue nil
|
||||
if params[:preview] == "true"
|
||||
preview_content
|
||||
else
|
||||
@email_er = EmailEr.all.can_display.where(_id: params[:id]).first
|
||||
if @email_er and !@email_er.disable? and !@email_er.is_rejected
|
||||
if @email_er.enabled_for_lang(I18n.locale.to_s)
|
||||
delayed_impressionist(@email_er)
|
||||
# get_categorys
|
||||
else
|
||||
render :text => "<div class='alert alert-error'>#{t('sys.can_not_display_due_to_no_context')}</div>".html_safe
|
||||
end
|
||||
else
|
||||
render :nothing => true, :status => 403
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
def preview_content
|
||||
@email_er = EmailEr.find params[:id] rescue nil
|
||||
@email_er = Preview.find(params[:id]).get_virtual_object if @email_er.nil?
|
||||
# get_categorys
|
||||
end
|
||||
|
||||
# GET /email_ers/new
|
||||
# GET /email_ers/new.xml
|
||||
def new
|
||||
|
||||
email_group_data
|
||||
|
||||
@email_er = EmailEr.new(:mail_sentdate => DateTime.now)
|
||||
|
||||
respond_to do |format|
|
||||
format.html # new.html.erb
|
||||
format.xml { render :xml => @email_er }
|
||||
end
|
||||
end
|
||||
|
||||
# GET /email_ers/1/edit
|
||||
def edit
|
||||
|
||||
email_group_data
|
||||
|
||||
@email_er = EmailEr.find(params[:id])
|
||||
|
||||
end
|
||||
|
||||
# POST /email_ers
|
||||
# POST /email_ers.xml
|
||||
def create
|
||||
|
||||
email_group_data
|
||||
|
||||
@email_er = EmailEr.new(params[:email_er])
|
||||
@email_er.create_user_id = current_user.id
|
||||
@email_er.update_user_id = current_user.id
|
||||
|
||||
if(is_manager? || is_admin?)
|
||||
@email_er.is_checked = true
|
||||
@email_er.is_rejected = false
|
||||
@email_er.de_pending
|
||||
end
|
||||
|
||||
respond_to do |format|
|
||||
if @email_er.save
|
||||
|
||||
# if @email_er.is_checked == true and !@email_er.is_rejected
|
||||
# send_email_data(@email_er)
|
||||
# end
|
||||
|
||||
format.html { redirect_to(panel_er_email_back_end_email_ers_url) }
|
||||
format.xml { render :xml => @email_er, :status => :created, :location => @email_er }
|
||||
# format.js
|
||||
format.js {
|
||||
@info = {"success"=>"true","redirect_url"=>panel_er_email_back_end_email_ers_url}
|
||||
flash[:notice] = t('er_email.create_er_email_success')
|
||||
render "/shared/preview/after_create.js.erb"
|
||||
}
|
||||
else
|
||||
format.html { render :action => "new" }
|
||||
format.xml { render :xml => @email_er.errors, :status => :unprocessable_entity }
|
||||
format.js {
|
||||
@info = {"success"=>"false","redirect_url"=>new_panel_er_email_back_end_email_er_url(:email_er => @email_er)}
|
||||
session[:in_validate_object] = @email_er
|
||||
render "/shared/preview/after_create.js.erb"
|
||||
}
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# PUT /email_ers/1
|
||||
# PUT /email_ers/1.xml
|
||||
def update
|
||||
|
||||
email_group_data
|
||||
|
||||
@email_er = EmailEr.find(params[:id])
|
||||
|
||||
@email_er.update_user_id = current_user.id
|
||||
|
||||
respond_to do |format|
|
||||
if @email_er.update_attributes(params[:email_er])
|
||||
|
||||
if(is_manager? || is_admin?)
|
||||
@email_er.is_checked = true
|
||||
@email_er.is_rejected = false
|
||||
@email_er.de_pending!
|
||||
end
|
||||
|
||||
if @email_er.is_checked == true and !@email_er.is_rejected
|
||||
send_email_data(@email_er)
|
||||
end
|
||||
|
||||
format.html { redirect_to(panel_er_email_back_end_email_ers_url(:page => params[:page])) }
|
||||
format.xml { head :ok }
|
||||
else
|
||||
format.html { render :action => "edit" }
|
||||
format.xml { render :xml => @email_er.errors, :status => :unprocessable_entity }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# DELETE /email_ers/1
|
||||
# DELETE /email_ers/1.xml
|
||||
def destroy
|
||||
@email_er = EmailEr.find(params[:id])
|
||||
@email_er.destroy
|
||||
|
||||
respond_to do |format|
|
||||
format.html { redirect_to(panel_er_email_back_end_email_ers_url) }
|
||||
# format.xml { head :ok }
|
||||
format.js
|
||||
end
|
||||
end
|
||||
|
||||
def delete
|
||||
if params[:ids]
|
||||
# email_ers = EmailEr.any_in(:_id => params[:ids]).destroy_all
|
||||
end
|
||||
redirect_to panel_er_email_back_end_email_ers_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
|
||||
end
|
||||
|
||||
def email_resend
|
||||
if params[:id]
|
||||
@email_er = EmailEr.find(params[:id])
|
||||
|
||||
@email_er.is_checked = false
|
||||
@email_er.is_pending = true
|
||||
|
||||
@email_er.save
|
||||
|
||||
end
|
||||
redirect_to panel_er_email_back_end_email_ers_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
|
||||
end
|
||||
|
||||
def test_send_email
|
||||
if params[:id]
|
||||
@email_er = EmailEr.find(params[:id])
|
||||
|
||||
if (@email_er.create_user_id == current_or_guest_user.id) || is_manager?
|
||||
if current_or_guest_user.admin? || (!@email_er.is_rejected? && !@email_er.is_checked?)
|
||||
if @email_er.is_pending
|
||||
send_email_data( @email_er , true )
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
redirect_to panel_er_email_back_end_email_ers_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def send_email_data(email_er , test_send = false)
|
||||
|
||||
@user = User.find(email_er.create_user_id)
|
||||
|
||||
if !test_send
|
||||
|
||||
email_group_data
|
||||
|
||||
@group_mail = Array.new
|
||||
|
||||
email_er.email_group.each do |egroup|
|
||||
|
||||
if @email_group_data.include?(egroup) and (egroup == '0' or egroup == '1' or egroup == '2' or egroup == '3')
|
||||
|
||||
@group_mail << @email_group_data[egroup]["email"]
|
||||
|
||||
elsif @email_group_data.include?(egroup) and egroup == '4'
|
||||
|
||||
@group_mail << email_er.other_mailaddress
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
else
|
||||
|
||||
# @group_mail = ["spen@rulingcom.com"]
|
||||
@group_mail = [@user.email]
|
||||
|
||||
end
|
||||
|
||||
if !@group_mail.join.blank?
|
||||
|
||||
@mail_content = {
|
||||
"text" => email_er.mail_content
|
||||
}
|
||||
|
||||
@mail_cron = {
|
||||
:mail_from_app => 'er_email',
|
||||
:mail_from => @user.email,
|
||||
:mail_reply_to => @user.email,
|
||||
:mail_subject => email_er.mail_subject,
|
||||
:mail_to => @group_mail.join(','),
|
||||
:mail_content => @mail_content ,
|
||||
# :mail_sentdate => email_er.mail_sentdate,
|
||||
:mail_sentdate => DateTime.now,
|
||||
:create_user_id => email_er.create_user_id,
|
||||
:update_user_id => email_er.create_user_id
|
||||
}
|
||||
|
||||
@mail_cron = MailCron.new(@mail_cron)
|
||||
|
||||
email_er.email_er_files.each do | mrfile |
|
||||
|
||||
@mcfile = @mail_cron.mail_cron_files.build
|
||||
|
||||
tmp_file = File.new(mrfile.file_identifier, 'w+')
|
||||
|
||||
tmp_file.write(Mongo::GridFileSystem.new(Mongoid.database).open(mrfile.file.url.gsub("/gridfs/", ""), 'r').read.force_encoding("UTF-8"))
|
||||
|
||||
@mcfile.file = tmp_file
|
||||
|
||||
@mcfile.title = mrfile.title
|
||||
|
||||
# delete file
|
||||
FileUtils.rm_f(tmp_file)
|
||||
|
||||
end
|
||||
|
||||
@mail_cron.save
|
||||
|
||||
MailCron.send_mail_now(@mail_cron.id)
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
def email_group_data
|
||||
|
||||
@email_group_data = EmailEr.email_group_data
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
Whitespace-only changes.
Vendored
-16
@@ -1,16 +0,0 @@
|
||||
module Panel::ErEmail::BackEnd::EmailErCategorysHelper
|
||||
include ActionView::Helpers::UrlHelper
|
||||
|
||||
|
||||
def show_anc_cate_permission_link(email_er_category)
|
||||
type = 'submit'
|
||||
oa = email_er_category.get_object_auth_by_title(type)
|
||||
if oa.nil?
|
||||
email_er_category.object_auths.new(title: type ).save
|
||||
oa = email_er_category.get_object_auth_by_title(type)
|
||||
end
|
||||
# link_to t(:category_auth), edit_admin_object_auth_path(oa)
|
||||
link_to t(:category_auth),admin_object_auth_ob_auth_path(oa)
|
||||
end
|
||||
|
||||
end
|
||||
-58
@@ -1,58 +0,0 @@
|
||||
module Panel::ErEmail::BackEnd::EmailErsHelper
|
||||
def show_reject_reason(email_er)
|
||||
by_email_er = email_er.is_rejected
|
||||
by_user = (((email_er.create_user_id == current_user.id) rescue nil) or is_manager? or is_admin?)
|
||||
by_email_er && by_user
|
||||
end
|
||||
|
||||
def show_form_status_field(email_er)
|
||||
#by_email_er = (!email_er.is_expired? and email_er.is_pending?)
|
||||
by_user = ((email_er.email_er_category.authed_users('fact_check').include?(current_user) rescue nil) or is_manager? or is_admin?)
|
||||
by_user
|
||||
end
|
||||
|
||||
def show_approval_link(email_er)
|
||||
by_email_er = (email_er.is_pending?)
|
||||
by_user = ((email_er.email_er_category.authed_users('fact_check').include?(current_user) rescue nil) or is_manager? or is_admin?)
|
||||
by_email_er and by_user
|
||||
end
|
||||
|
||||
def show_delete_link(email_er)
|
||||
if !current_user.nil?
|
||||
by_email_er = (email_er.create_user_id == current_user.id )
|
||||
by_user = (is_manager? or is_admin?)
|
||||
by_email_er or by_user
|
||||
else
|
||||
false
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
def show_email_er_title_at_index (email_er)
|
||||
if email_er.is_checked?
|
||||
link_to email_er.title, panel_er_email_front_end_email_er_path(email_er, :category_id => email_er.email_er_category.id) rescue ''
|
||||
else
|
||||
email_er.title
|
||||
end
|
||||
end
|
||||
|
||||
def file_picture_preview_setting(file_path)
|
||||
ext = File.extname(file_path)[1..-1].downcase
|
||||
unless file_path.nil?
|
||||
case ext
|
||||
when "jpg","jpeg","png","gif"
|
||||
{"data-content" => "#{image_tag file_path}" }
|
||||
when "pdf", "zip", "rar"
|
||||
{"data-content" => "#{image_tag("http://#{request.host_with_port}/assets/ft-icons/#{ext}/#{ext}-64_32.png")}"}
|
||||
when "doc", "docx"
|
||||
{"data-content" => "#{image_tag("http://#{request.host_with_port}/assets/ft-icons/docx_mac/docx_mac-64_32.png")}"}
|
||||
when "xls", "xlsx"
|
||||
{"data-content" => "#{image_tag("http://#{request.host_with_port}/assets/ft-icons/xlsx_mac/xlsx_mac-64_32.png")}"}
|
||||
when "ppt", "pptx"
|
||||
{"data-content" => "#{image_tag("http://#{request.host_with_port}/assets/ft-icons/pptx_mac/pptx_mac-64_32.png")}"}
|
||||
else
|
||||
{"data-content" => t("sys.not_previewable") }
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
Whitespace-only changes.
Whitespace-only changes.
@@ -1,123 +0,0 @@
|
||||
# encoding: utf-8
|
||||
|
||||
class EmailEr
|
||||
include Mongoid::Document
|
||||
include Mongoid::Timestamps
|
||||
include Mongoid::MultiParameterAttributes
|
||||
|
||||
include OrbitCoreLib::Preview
|
||||
|
||||
BelongsToCategory = :email_er_category
|
||||
include OrbitCoreLib::BelongsToCategoryMayDisable
|
||||
|
||||
PAYMENT_TYPES = @site_valid_locales
|
||||
|
||||
field :mail_subject
|
||||
field :mail_sentdate , :type => DateTime
|
||||
field :mail_content
|
||||
|
||||
field :create_user_id
|
||||
field :update_user_id
|
||||
|
||||
field :is_checked, :type => Boolean, :default => false
|
||||
field :is_pending, :type => Boolean, :default => true
|
||||
field :is_rejected, :type => Boolean, :default => false
|
||||
|
||||
field :not_checked_reason
|
||||
|
||||
field :email_group, :type => Array
|
||||
field :other_mailaddress
|
||||
|
||||
scope :can_display,where(is_hidden: false)
|
||||
|
||||
has_many :email_er_files, :autosave => true, :dependent => :destroy
|
||||
|
||||
accepts_nested_attributes_for :email_er_files, :allow_destroy => true
|
||||
|
||||
validates :mail_subject,presence:{message:'blank is not allowed'}
|
||||
validates :other_mailaddress,
|
||||
:length => {:maximum => 1000, :message => I18n.t("er_email.other_mailaddress_note_limit")}
|
||||
|
||||
def proc_check(check,not_pass_info = "")
|
||||
self.is_checked = true
|
||||
if check =="true"
|
||||
self.is_rejected = false
|
||||
elsif check == "false"
|
||||
self.is_rejected = true
|
||||
self.not_checked_reason = not_pass_info
|
||||
end
|
||||
end
|
||||
|
||||
def de_pending
|
||||
self.is_pending = false
|
||||
end
|
||||
|
||||
def de_pending!
|
||||
de_pending
|
||||
self.save!
|
||||
end
|
||||
|
||||
def is_checked?
|
||||
!self.is_pending && self.is_checked && (self.is_rejected == false)
|
||||
end
|
||||
|
||||
def is_pending?
|
||||
self.is_pending
|
||||
end
|
||||
|
||||
def is_rejected?
|
||||
!self.is_pending && self.is_rejected && (self.is_rejected == true)
|
||||
end
|
||||
|
||||
def get_email_group_data(email_group_data)
|
||||
|
||||
group_mail = Array.new
|
||||
|
||||
self.email_group.each do |egroup|
|
||||
|
||||
if email_group_data.include?(egroup) and (egroup == '0' or egroup == '1' or egroup == '2' or egroup == '3')
|
||||
|
||||
group_mail << "#{email_group_data[egroup]["email"]}(#{email_group_data[egroup]["name"]})"
|
||||
|
||||
elsif email_group_data.include?(egroup) and egroup == '4'
|
||||
|
||||
self.other_mailaddress.split(",").each do |otmail|
|
||||
|
||||
group_mail << "#{otmail}(#{email_group_data[egroup]["name"]})"
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
group_mail.join("<br />").html_safe
|
||||
|
||||
end
|
||||
|
||||
def to_preview
|
||||
preview_object = Preview.new(:expired_at=>DateTime.now+30.minutes,:preview_at_link=>"panel_er_email_back_end_email_er_path",:object_class_type=>"EmailEr")
|
||||
|
||||
self.email_er["email_er_files_attributes"].each_with_index do |atr,idx|
|
||||
preview_object.preview_files.build(:file=>self.email_er["email_er_files_attributes"][idx.to_s],:field_name_for_rebuild=>'email_er_files',:file_in_array=>true)
|
||||
end unless self.email_er["email_er_files_attributes"].nil?
|
||||
|
||||
preview_object.object = self.email_er.except("email_er_files_attributes")
|
||||
preview_object
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def self.email_group_data
|
||||
|
||||
@email_group_data = {
|
||||
'0'=> {"name"=>I18n.t('er_email.email_group_data_0'), "email"=>"alluser@tea.ntue.edu.tw"},
|
||||
'1'=> {"name"=>I18n.t('er_email.email_group_data_1'), "email"=>"allstu@tea.ntue.edu.tw"},
|
||||
'2'=> {"name"=>I18n.t('er_email.email_group_data_2'), "email"=>"allgrad@tea.ntue.edu.tw"},
|
||||
'3'=> {"name"=>I18n.t('er_email.email_group_data_3'), "email"=>"allad@tea.ntue.edu.tw"},
|
||||
'4'=> {"name"=>I18n.t('er_email.email_group_data_4')}
|
||||
}
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
@@ -1,47 +0,0 @@
|
||||
# encoding: utf-8
|
||||
|
||||
class EmailErCategory
|
||||
include Mongoid::Document
|
||||
include Mongoid::Timestamps
|
||||
include OrbitCoreLib::ObjectAuthable
|
||||
include OrbitCoreLib::ObjectDisable
|
||||
include Sunspot::Mongo
|
||||
# include Mongoid::MultiParameterAttributes
|
||||
APP_NAME = 'ErEmail'
|
||||
ObjectAuthTitlesOptions = %W{submit_new fact_check}
|
||||
AfterObjectAuthUrl = '/panel/er_email/back_end/email_er_categorys'
|
||||
|
||||
field :disable, type: Boolean, :default => false
|
||||
field :display
|
||||
field :key
|
||||
field :title, localize: true
|
||||
|
||||
has_many :email_ers
|
||||
|
||||
validates :title, :at_least_one => true
|
||||
|
||||
searchable do
|
||||
text :titles do
|
||||
title_translations.to_a.collect{|t| t[1]}
|
||||
end
|
||||
|
||||
boolean :frontend_search do
|
||||
!disable
|
||||
end
|
||||
|
||||
text :files do
|
||||
email_ers.can_display.collect{|t| t.title_translations.to_a.collect{|t| t[1]}}
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
|
||||
def pp_object
|
||||
title
|
||||
end
|
||||
|
||||
def self.from_id(id)
|
||||
EmailErCategory.find(id) rescue nil
|
||||
end
|
||||
|
||||
end
|
||||
@@ -1,23 +0,0 @@
|
||||
class EmailErFile
|
||||
|
||||
include Mongoid::Document
|
||||
include Mongoid::Timestamps
|
||||
|
||||
mount_uploader :file, AssetUploader
|
||||
|
||||
field :should_destroy, :type => Boolean
|
||||
field :title
|
||||
|
||||
belongs_to :email_er
|
||||
|
||||
validate :file_size
|
||||
|
||||
private
|
||||
|
||||
def file_size
|
||||
if file.file.size > 1.megabytes
|
||||
errors.add( :file, I18n.t("er_email.email_file_limit"))
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
Whitespace-only changes.
vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/approvals/_modal_approve.html.erb
Vendored
-68
@@ -1,68 +0,0 @@
|
||||
<% if email_er -%>
|
||||
|
||||
<div class="modal hide fade in banner-preview" id="email_er-<%=email_er.id%>">
|
||||
<div class="modal-header">
|
||||
<a class="close" data-dismiss="modal">×</a>
|
||||
<h3><%= t(:preview) %></h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<p class="email_er_slideshow">
|
||||
<iframe src=<%= panel_er_email_back_end_email_er_path(email_er, :category_id => email_er.email_er_category.id ,:preview=>true) %> style="width:1024px;height:300px" >
|
||||
|
||||
</iframe>
|
||||
|
||||
<% if !@email_er.email_group.blank? %>
|
||||
<%= label_tag 'group_mail' %>
|
||||
<%= @email_er.get_email_group_data(@email_group_data) %>
|
||||
<% end %>
|
||||
|
||||
</p>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
|
||||
<%= form_for email_er, :url => panel_er_email_back_end_email_er_approve_path(email_er),:method => :post, :html => {:class => 'clear'} do |f| %>
|
||||
<%= f.label :approval_stat, t('approval.stat') %>
|
||||
<%= content_tag :label,:class => "radio inline" do -%>
|
||||
<%= f.radio_button :is_checked, true , {:class => 'privacy'} %>
|
||||
<%= t('approval.pass') %>
|
||||
<% end -%>
|
||||
<%= content_tag :label,:class => "radio inline" do -%>
|
||||
<%= f.radio_button :is_checked, false, (!@email_er.is_checked ? {:checked => true, :class => 'privacy'} : {})%>
|
||||
<%= t('approval.not_pass') %>
|
||||
<% end -%>
|
||||
|
||||
<%= label :is_checked_false, t('approval.not_pass_reason') %>
|
||||
<%= f.text_field :not_checked_reason %>
|
||||
<%= f.submit t(:submit_approval),:class=>"btn"%>
|
||||
<% end %>
|
||||
|
||||
<a href="#" class="btn" data-dismiss="modal"><%= t(:close) %></a>
|
||||
</div>
|
||||
<div>
|
||||
<script type="text/javascript" src="/static/kernel.js"></script>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
|
||||
$(".modal").on("hidden", function () {
|
||||
$("#show_preview").remove();
|
||||
});
|
||||
|
||||
$("iframe").load(function(){
|
||||
// Get the body element
|
||||
var frameBody = $("iframe").contents().find("body");
|
||||
|
||||
// Get all links inside the BODY tag
|
||||
$('a', frameBody).click(function(e){
|
||||
//Disable all default actions
|
||||
e.preventDefault();
|
||||
});
|
||||
$('input', frameBody).attr("disabled", true);
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<% end -%>
|
||||
Vendored
-44
@@ -1,44 +0,0 @@
|
||||
<% if email_er_category -%>
|
||||
|
||||
<div class="modal hide fade in" id="email_er_category-<%=email_er_category.id%>">
|
||||
<div class="modal-header">
|
||||
<a class="close" data-dismiss="modal">×</a>
|
||||
<h3><%= t("approval.user_list") %></h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="clear">
|
||||
<% email_er_category.get_object_auth_by_title('fact_check').auth_users.each do |user| %>
|
||||
<div class="checkbox clear checked">
|
||||
<div class='member-avatar'>
|
||||
<% if user.avatar? %>
|
||||
<%= image_tag(user.avatar.thumb.url,:class => "member-img") %>
|
||||
<% else %>
|
||||
<%= image_tag "person.png",:class => "member-img" %>
|
||||
<% end %>
|
||||
</div>
|
||||
<%= label_tag "lab-user-#{user.id}", (user.name rescue ''),:class=>"member-name",:id=>nil -%>
|
||||
</div>
|
||||
<% end -%>
|
||||
<divl>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<a href="#" class="btn" data-dismiss="modal"><%= t(:close) %></a>
|
||||
</div>
|
||||
<div>
|
||||
<script type="text/javascript" src="/static/kernel.js"></script>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
|
||||
$("#email_er_category-<%=email_er_category.id%>").on("show", function () {
|
||||
});
|
||||
$(".modal").on("hidden", function () {
|
||||
$("#show_preview").remove();
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<% end -%>
|
||||
-5
@@ -1,5 +0,0 @@
|
||||
$('#show_preview').html("<%= escape_javascript(render(:partial => 'modal_approve',:locals => {:email_er => @email_er})) %>");
|
||||
var start_modal_with_id = "email_er-<%=@email_er.id%>";
|
||||
$("#"+start_modal_with_id).css("width","1050px");
|
||||
$("#"+start_modal_with_id).css("height","768px");
|
||||
$("#"+start_modal_with_id).css("margin","-270px 0 0 -550px");
|
||||
Vendored
-53
@@ -1,53 +0,0 @@
|
||||
<% content_for :page_specific_css do %>
|
||||
<%= stylesheet_link_tag "inc/permission-checkbox" %>
|
||||
<% end %>
|
||||
<% content_for :page_specific_javascript do %>
|
||||
<%= javascript_include_tag "inc/permission-checkbox" %>
|
||||
<%= javascript_include_tag "inc/search" %>
|
||||
<%= javascript_include_tag "inc/modal-preview" %>
|
||||
<% end %>
|
||||
<%= form_tag('', :remote => true,:class => "prevent_enter_submit_form") %>
|
||||
<div class="subnav clear">
|
||||
<ul class="nav nav-pills filter pull-left">
|
||||
<li class="accordion-group">
|
||||
<div class="form-search" style="margin: 5px 10px;">
|
||||
<%= label_tag :category, t(:category) %>
|
||||
<%= select "category",'id',@options_from_collection_for_select_email_er_categorys %>
|
||||
<%= search_field_tag 'user_filter' %>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
<%= link_to t("approval.user_list"), panel_er_email_back_end_approval_user_list_path , :class=>'preview_trigger btn btn-success pull-right'%>
|
||||
</div>
|
||||
<%#= label_tag :role, t(:roles) %>
|
||||
<div class="clear">
|
||||
<%= content_tag :div do -%>
|
||||
<% form_tag panel_er_email_back_end_approval_setting_path do %>
|
||||
<%= render :partial => "layouts/users_checkbox_ary" %>
|
||||
<div class="form-actions form-fixed pagination-right">
|
||||
<%= submit_tag t(:update_), :class => 'btn btn-primary' %>
|
||||
</div>
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
</div>
|
||||
|
||||
<script type="text/javascript" charset="utf-8">
|
||||
var availableTags = [];
|
||||
$(document).ready(function() {
|
||||
|
||||
$(".prevent_enter_submit_form").bind("keypress", function(e) {
|
||||
if (e.keyCode == 13) {
|
||||
return false;
|
||||
}
|
||||
});
|
||||
|
||||
$('#category_id').change(function() {
|
||||
$.ajax({
|
||||
type: 'GET',
|
||||
dataType: "script",
|
||||
url:$(this).parents("from").attr("href"),
|
||||
data:$(this).parents("form").serialize()
|
||||
});
|
||||
});
|
||||
});
|
||||
</script>
|
||||
Vendored
-2
@@ -1,2 +0,0 @@
|
||||
$("#users_checkbox_ary").replaceWith('<%= escape_javascript(render :partial=> "layouts/users_checkbox_ary" )%>');
|
||||
permissionCheckbox();
|
||||
Vendored
-1
@@ -1 +0,0 @@
|
||||
alert( "<% flash.each do |key, msg| %><%= msg %><% end%>");
|
||||
Vendored
-2
@@ -1,2 +0,0 @@
|
||||
$('#show_preview').html("<%= escape_javascript(render(:partial => 'modal_list',:locals => {:email_er_category => @email_er_category})) %>");
|
||||
var start_modal_with_id = "email_er_category-<%=@email_er_category.id%>"
|
||||
-19
@@ -1,19 +0,0 @@
|
||||
|
||||
|
||||
<tr id="<%= dom_id email_er_category %>" class="with_action">
|
||||
<td>
|
||||
<%= email_er_category.key %>
|
||||
<div class="quick-edit">
|
||||
<ul class="nav nav-pills hide">
|
||||
<li><%= link_to t(:edit), edit_panel_er_email_back_end_email_er_category_path(email_er_category), :remote => true %></li>
|
||||
<li><%= link_to show_toggle_archive_btn(email_er_category) , panel_er_email_back_end_email_er_category_path(email_er_category), :confirm => t(:sure?), :method => :delete, :remote => true,:class=> "archive_toggle" %></li>
|
||||
<%if is_manager? || is_admin? %>
|
||||
<li><%= show_anc_cate_permission_link(email_er_category) %></li>
|
||||
<% end %>
|
||||
</ul>
|
||||
</div>
|
||||
</td>
|
||||
<% @site_valid_locales.each do |locale| %>
|
||||
<td><%= email_er_category.title_translations[locale] rescue nil %></td>
|
||||
<% end %>
|
||||
</tr>
|
||||
vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_er_categorys/_form.html.erb
Vendored
-30
@@ -1,30 +0,0 @@
|
||||
<% # encoding: utf-8 %>
|
||||
|
||||
<%= form_for(@email_er_category, :remote => true, :url => @url) do |f| %>
|
||||
|
||||
<h2><%= (@email_er_category.new_record? ? 'Add' : 'Edit') %></h2>
|
||||
|
||||
<div id="widget-title">
|
||||
<%= f.label :key %>
|
||||
<%= f.text_field :key %>
|
||||
</div>
|
||||
|
||||
<div id="widget-title">
|
||||
<%= f.fields_for :title_translations do |f| %>
|
||||
<% @site_valid_locales.each do |locale| %>
|
||||
<div class="control-group">
|
||||
<%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
|
||||
<div class="controls">
|
||||
<%= f.text_field locale, :class =>' input-xxlarge', :value => (@email_er_category.title_translations[locale] rescue nil) %>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
<div class="form-actions">
|
||||
<%= f.submit 'Submit/送出', :class=>'btn btn-primary' %>
|
||||
</div>
|
||||
|
||||
<% end %>
|
||||
|
||||
Vendored
-2
@@ -1,2 +0,0 @@
|
||||
$('<%= j render :partial => 'email_er_category', :collection => [@email_er_category] %>').appendTo('#email_er_categorys').hide().fadeIn();
|
||||
$("#new_email_er_category")[0].reset();
|
||||
vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_er_categorys/destroy.js.erb
Vendored
-1
@@ -1 +0,0 @@
|
||||
$("#<%= dom_id @email_er_category %>").find(".archive_toggle").text("<%= show_toggle_archive_btn(@email_er_category) %> ");
|
||||
Vendored
-1
@@ -1 +0,0 @@
|
||||
$("#form > form").replaceWith("<%= j render "form" %>");
|
||||
vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_er_categorys/index.html.erb
Vendored
-23
@@ -1,23 +0,0 @@
|
||||
|
||||
|
||||
<%= flash_messages %>
|
||||
|
||||
<table id="email_er_categorys" class="table main-list">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="span1-2"><%= t('email_er_category.key') %></th>
|
||||
<% @site_valid_locales.each do |locale| %>
|
||||
<th class="span1-2"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></th>
|
||||
<% end %>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
<%= render :partial => 'email_er_category', :collection => @email_er_categorys %>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div id="form"><%= render :partial => "form" %></div>
|
||||
|
||||
|
||||
Vendored
-1
@@ -1 +0,0 @@
|
||||
$("#form > form").replaceWith("<%= j render "form" %>");
|
||||
Vendored
-4
@@ -1,4 +0,0 @@
|
||||
$("#<%= dom_id @email_er_category %>").replaceWith("<%= j render :partial => 'email_er_category', :collection => [@email_er_category] %>");
|
||||
<% @email_er_category = EmailErCategory.new(:display => 'List') # reset for new form %>
|
||||
$(".edit_email_er_category").replaceWith("<%= j render "form" %>")
|
||||
$(".new_email_er_category")[0].reset();
|
||||
vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_ers/_clear_filters.html.erb
Vendored
-3
@@ -1,3 +0,0 @@
|
||||
<div class="filter-clear">
|
||||
<%= link_to content_tag(:i, nil, :class => 'icons-cycle') + t(:clear), panel_archive_back_end_archive_files_path(:filter => @filter, :sort => params[:sort], :direction => params[:direction], :clear => true, :type => type), :class => "btn btn-small js_history" %>
|
||||
</div>
|
||||
Vendored
-61
@@ -1,61 +0,0 @@
|
||||
<tr id="<%= dom_id email_er %>" class="with_action">
|
||||
<td>
|
||||
<% if (email_er.create_user_id == current_or_guest_user.id) || is_manager? %>
|
||||
<%= check_box_tag 'to_delete[]', email_er.id, false, :class => "checkbox_in_list" %>
|
||||
<% end -%>
|
||||
</td>
|
||||
<td>
|
||||
<div class="label-group">
|
||||
<div class="label-td">
|
||||
<% if email_er.is_pending? %>
|
||||
<span class="label"><%= t(:pending) %></span>
|
||||
<% end %>
|
||||
<% if email_er.is_checked? %>
|
||||
<span class="label"><%= t(:passed) %></span>
|
||||
<% end %>
|
||||
<% if email_er.is_rejected? %>
|
||||
<span class="label"><%= t(:rejected) %></span>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<%= email_er.email_er_category.title %>
|
||||
</td>
|
||||
<td class="span1">
|
||||
<%= email_er.mail_subject %>
|
||||
<div class="quick-edit">
|
||||
<ul class="nav nav-pills hide">
|
||||
<%#if at_least_module_manager %>
|
||||
|
||||
<% if (email_er.create_user_id == current_or_guest_user.id) || is_manager? %>
|
||||
<% if current_or_guest_user.admin? || (!email_er.is_rejected? && !email_er.is_checked?) %>
|
||||
|
||||
<li><%= link_to t(:edit), edit_panel_er_email_back_end_email_er_path(email_er, :page => params[:page], :filter => @filter) %></li>
|
||||
|
||||
<% if email_er.is_pending %>
|
||||
<li><%= link_to t('er_email.test_send_email'), test_send_email_panel_er_email_back_end_email_ers_path(:id=>email_er.id), :confirm => t('sure?'), :controller => "email_er", :action => "test_send_email" %></li>
|
||||
<% end %>
|
||||
|
||||
<% end %>
|
||||
<li><%= link_to t(:delete_), panel_er_email_back_end_email_er_path(email_er), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
|
||||
|
||||
<% if email_er.is_checked and !email_er.is_rejected %>
|
||||
<li><%= link_to t('er_email.email_resend'), email_resend_panel_er_email_back_end_email_ers_path(:id=>email_er.id), :confirm => t('sure?'), :controller => "email_er", :action => "email_resend" %></li>
|
||||
<% end %>
|
||||
|
||||
<% end -%>
|
||||
|
||||
<% if show_approval_link(email_er) %>
|
||||
<li><%= link_to t(:approval_), panel_er_email_back_end_email_er_approval_preview_path(email_er),:class => 'preview_trigger' %></li><%#= #TODO add ancher so user can quick access into that part %>
|
||||
<% end %>
|
||||
<% if show_reject_reason(email_er)%>
|
||||
<li><%= link_to t('rejected_reason')+truncate(email_er.not_checked_reason, :length => 10),'#',:rel=>"tooltip" ,'data-original-title'=> (wrap_string_with(email_er.not_checked_reason, :line_width => 24)),:class=>'reject_info' %></li>
|
||||
<% end %>
|
||||
</ul>
|
||||
</div>
|
||||
</td>
|
||||
<td class="span2">
|
||||
<%= email_er.get_email_group_data(@email_group_data) %>
|
||||
</td>
|
||||
</tr>
|
||||
Vendored
-11
@@ -1,11 +0,0 @@
|
||||
<div id="filter" class="subnav">
|
||||
<div class="filters">
|
||||
<div id="sort_headers" class="table-label">
|
||||
<%= render 'sort_headers' %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<% content_for :page_specific_javascript do %>
|
||||
<%= javascript_include_tag "sort_header" %>
|
||||
<% end %>
|
||||
Loaded 100 of 166 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user