fgu

app/controllers/panel/announcement/back_end/approvals_controller.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 class Panel::Announcement::BackEnd::ApprovalsController  < OrbitBackendController
   before_filter :authenticate_user!
   before_filter :is_admin?
@@ -16,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,43 +62,4 @@ class Panel::Announcement::BackEnd::ApprovalsController  < OrbitBackendControlle
     object_auth
   end
   
-  def send_email_data(bulletin)
-
-    @site = Site.first
-    @user = User.find(bulletin.create_user_id)
-    @host = request.host_with_port
-
-    @group_mail = MailCron.get_send_group_mail( bulletin.email_user_ids , bulletin.other_mailaddress )
-    
-    if !@group_mail.join.blank?
-
-      @mail_content = {
-        "host" => @host,
-        "lang" => I18n.locale,
-        "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.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,
-        :create_user_id => bulletin.create_user_id,
-        :update_user_id => bulletin.create_user_id
-      } 
-
-      @mail_cron = MailCron.new(@mail_cron) 
-
-      @mail_cron.save
-
-    end
-    
-  end  
-  
 end

app/controllers/panel/announcement/back_end/bulletins_controller.rb

@@ -94,23 +94,23 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 
     @bulletin.create_user_id = current_user.id
     @bulletin.update_user_id = current_user.id
-
+    # if(is_manager? || is_admin?)
-    if(is_manager? || is_admin?)
+    #   @bulletin.is_checked = true
-      @bulletin.is_checked = true
+    #   @bulletin.is_rejected = false
-      @bulletin.is_rejected = false
+    #   @bulletin.de_pending
-      @bulletin.de_pending
+    # end
-    end
 
     respond_to do |format|
       if @bulletin.save
 
-        if @bulletin.email_sent == true && @bulletin.is_checked == true && !@bulletin.is_rejected
+        if @bulletin.email_sent == true && (is_manager? || is_admin?)
           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
@@ -148,13 +148,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
       respond_to do |format|
         if @bulletin.update_attributes(params[:bulletin])
 
-        if(is_manager? || is_admin?)
+          if @bulletin.email_sent == true && (is_manager? || is_admin?)
-          @bulletin.is_checked = true
-          @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

app/models/bulletin.rb

@@ -25,16 +25,8 @@ class Bulletin
   field :create_user_id
   field :update_user_id, :class_name => "User"
   
-  field :is_top, :type => Boolean, :default => false
-  field :is_hot, :type => Boolean, :default => false
-  field :is_hidden, :type => Boolean, :default => false
-  field :is_checked, :type => Boolean, :default => false
-  field :is_pending, :type => Boolean, :default => true 
-  field :is_rejected, :type => Boolean, :default => false 
   field :view_count, :type => Integer, :default => 0
   
-  field :not_checked_reason
-  
   field :public, :type => Boolean, :default => true
 
   field :email_sent, :type => Boolean, :default => false
@@ -42,9 +34,6 @@ class Bulletin
   field :email_user_ids
   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) }
-
   mount_uploader :image, ImageUploader
 
   has_many :bulletin_links, :autosave => true, :dependent => :destroy
@@ -55,6 +44,8 @@ class Bulletin
   
   validates :title, :at_least_one => true
 
+  validate :image_size
+
   # def to_indexed_json
   #   self.to_json
   # end
@@ -125,36 +116,6 @@ class Bulletin
    
   end
 
-  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 save_bulletin_links
 	self.bulletin_links.each do |t|
@@ -212,5 +173,12 @@ class Bulletin
   #   self.tag_ids.delete('')
   # end
 
+  def image_size
+    if self.image.size > 500.kilobyte
+      errors.add( :image,  I18n.t("announcement.image_limit"))
+    end
+  end
+
+
 
 end

app/views/panel/announcement/back_end/approvals/_modal_approve.html.erb

@@ -5,19 +5,9 @@
     <a class="close" data-dismiss="modal">×</a>
     <h3><%= t(:preview) %></h3>
   </div>
-  <div class="modal-body clearfix">
+  <div class="modal-body">
-    <div class="modal-left">
-<%= label_tag t('announcement.email_to') %>
-		<% if @bulletin.email_sent == true and ( !@bulletin.email_user_ids.blank? || !@bulletin.other_mailaddress.blank? ) %>
-			
-			<%= MailCron.get_send_group_mail(@bulletin.email_user_ids , @bulletin.other_mailaddress).join("<br />").html_safe %>
-		<% end %>
-		
-    </div>
-    <div class="modal-right">
 		<iframe src=<%= panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.category.id ,:preview=>true) %>></iframe>
   </div>
-  </div>
   <div class="modal-footer">
 
 		<%= form_for bulletin, :url => panel_announcement_back_end_bulletin_approve_path(bulletin),:method => :post, :html => {:class => 'form-horizontal'} do |f| %>

app/views/panel/announcement/back_end/bulletins/_form.html.erb

@@ -139,7 +139,7 @@
               </label>
             </div>
           </div>
-          <div class="image_note"><%= t("announcement.image_note")%></div>
+          <div class="image_note"><br /><%= t("announcement.image_note")%><br /><%= t("announcement.image_size_note")%></div>
         </div>
       </div>
 

app/views/panel/announcement/back_end/bulletins/index.html.erb

@@ -6,9 +6,9 @@
 	quick_edit_link type: 'delete',
 									link: 'panel_announcement_back_end_bulletin_path'
 									# can have: title, warning, cancel and submit values
-	quick_edit_link type: 'approval',
+	# quick_edit_link type: 'approval',
-									link: 'panel_announcement_back_end_bulletin_approval_preview_path'
+	# 								link: 'panel_announcement_back_end_bulletin_approval_preview_path'
-	quick_edit_link type: 'reject_reason'
+	# quick_edit_link type: 'reject_reason'
 	field type: 'status',
 				db_field: @statuses,
 				translation: 'status',

config/locales/en.yml

@@ -28,6 +28,8 @@ en:
       search_result: Search result
     image: Cover image
     image_note: The image will not show in content
+    image_size_note: Limited to 500KB
+    image_limit: Image upload size is limited to 500KB
     link_name: Link Name
     new_bulletin_category: New Bulletin Category
     picture: Cover Picture

config/locales/zh_tw.yml

@@ -30,6 +30,8 @@ zh_tw:
       search_result: 搜尋結果頁
     image: 封面圖片
     image_note: 此處上傳的圖片不會在公告內文出現
+    image_size_note: 系統限制上傳500k以下的圖片
+    image_limit: 圖片上傳容量限制為500kB
     link_name: 連結名稱
     new_bulletin_category: 新增公告類別
     picture: 刊頭圖片

lib/announcement.rb

@@ -28,13 +28,13 @@ module Announcement
 			data_count 1..10
 
 			authorizable
-			approvable
+			# approvable
 			categorizable
 			taggable
 
 			widgets do
 			  default_widget do
-			    query 'Bulletin.can_display.available_for_lang(I18n.locale).any_of( {deadline: nil,:postdate.lte => Time.now} , {:deadline.gte => Time.now,:postdate.lte => Time.now} )'
+			    query 'Bulletin'
 			    enable ["typeA", "typeB_style3", "typeC"]
 			    image :image
 			    field :postdate