fgu

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

@@ -141,6 +141,8 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 
       params[:bulletin][:email_user_ids] = params[:bulletin][:email_user_ids].uniq
       params[:bulletin][:email_user_ids].delete('')
+
+      params[:bulletin][:update_user_id] = current_user.id
       
       delete_out_invalid_date_from_params
       respond_to do |format|

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

@@ -146,7 +146,15 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
 
     @selected_tag = Tag.find(params[:tag_id]).first
     @ModuleApp = ModuleApp.first(:conditions => {:key=>'web_resource'})
-    @link_selected_tag = Tag.first(:conditions => {:name => @selected_tag.name, :module_tag_id => @ModuleApp.id})
+    @link_module_tag = ModuleTag.first(:conditions => {:name => @selected_tag.name, :module_app_id => @ModuleApp.id})
+    # @link_selected_tag = Tag.first(:conditions => {:name => @selected_tag.name, :tag_lease_id => @ModuleApp.id})
+
+    if !@link_module_tag.blank? 
+      @link_selected_tag = Tag.first(:conditions => {:name => @selected_tag.name, :tag_lease_id => @link_module_tag.id})
+    else
+      @link_selected_tag = @link_module_tag
+    end
+
     @web_links = WebLink.where(:tagged_ids => @link_selected_tag.id.to_s, :is_hidden => false).desc(:is_top,:created_at).available_for_lang(I18n.locale).page(params[:page]).per(@page_num) rescue nil
   end
 

app/models/bulletin.rb

@@ -16,7 +16,7 @@ class Bulletin
   # include Tire::Model::Search
   # include Tire::Model::Callbacks
 
-  is_impressionable :counter_cache => { :column_name => :view_count }
+  is_impressionable
 
   field :title, localize: true
   field :subtitle, localize: true
@@ -44,6 +44,8 @@ class Bulletin
   
   validates :title, :at_least_one => true
 
+  validate :image_size
+
   # def to_indexed_json
   #   self.to_json
   # end
@@ -158,6 +160,10 @@ class Bulletin
     User.find(self.email_user_ids) rescue []
   end
 
+  def view_count
+    Impression.where(:impressionable_id=>self.id).count
+  end
+
   protected
 
   # def clean_values
@@ -167,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/bulletins/_form.html.erb

@@ -33,7 +33,7 @@
       <a href="#tag" data-toggle="tab"><%= t(:tags) %></a>
     </li>
     <li>
-      <a href="#imageupload" data-toggle="tab"><%= t(:image) %></a>
+      <a href="#imageupload" data-toggle="tab"><%= t("announcement.image") %></a>
     </li>
     <li>
       <a href="#mail-group" data-toggle="tab"><%= t('announcement.email_reminder')%></a>
@@ -116,7 +116,7 @@
 
       <!-- Images Upload -->
       <div class="control-group">
-        <label class="control-label muted"><%= t(:image) %></label>
+        <label class="control-label muted"><%= t("announcement.image") %></label>
         <div class="controls">
           <div class="fileupload fileupload-new clearfix <%= 'fileupload-edit' if @bulletin.image.file %>" data-provides="fileupload">
             <div class="fileupload-new thumbnail pull-left">
@@ -139,6 +139,7 @@
               </label>
             </div>
           </div>
+          <div class="image_note"><br /><%= t("announcement.image_note")%><br /><%= t("announcement.image_size_note")%></div>
         </div>
       </div>
 
@@ -241,6 +242,10 @@
 
     <% end %>
 
+    <div class="control-group">
+      <div class="controls add-input"><%= t('announcement.append_note')%></div>
+    </div>
+
     <!-- Link -->
     <div class="control-group">
       <label class="control-label muted"><%= t(:link) %></label>

app/views/panel/announcement/front_end/bulletins/show.html.erb

@@ -8,10 +8,6 @@
 		<span><%=  link_to unit,panel_announcement_front_end_index_bulletins_by_unit_path(:name=>unit) unless unit.blank? %></span>
 	</div>
 </div>
-<div class="news_image">
-	<%#= image_tag(@bulletin.image.url, :size => "320x240") if @bulletin.image.file %>
-	<%= link_to image_tag(@bulletin.image.url, :size => "320x240"), @bulletin.image.url, {:target => '_blank', :title => @bulletin.image_identifier} if @bulletin.image.file %>
-</div>
 <div class="news_paragraph">
 	<%= @bulletin.text.html_safe rescue '' %>
 </div>

config/locales/en.yml

@@ -4,6 +4,7 @@ en:
     add_new: Add New
     all_articles: All Articles
     announcement: Announcement
+    append_note: Suggest to input underside Link and File's annotation to show correct info in frontend
     approval_setting: Approval Setting
     approve_bulletin_fail: Approval Fail
     approve_bulletin_success: Approve Successfully
@@ -13,7 +14,7 @@ en:
     create_bulletin_category_success: Create Category Successfully
     date: Announcement Date
     default_widget:
-      bulletin_category_with_title: Bulletin Category with Title
+      bulletin_category_with_title: Category
       postdate: Post Date
       subtitle: Subtitle
       title: Title
@@ -25,6 +26,10 @@ en:
     frontend:
       bulletins: Announcement front-end
       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

@@ -4,6 +4,7 @@ zh_tw:
     add_new: 新建
     all_articles: 文章列表
     announcement: 公告
+    append_note: 以下之附加連結與檔案，為使前台顯示名稱，建議您輸入註解。
     approval_setting: 審核設定
     approve_bulletin_fail: 審核失敗
     approve_bulletin_success: 審核成功
@@ -13,7 +14,7 @@ zh_tw:
     create_bulletin_category_success: 建立類別成功
     date: 起迄日期
     default_widget:
-      bulletin_category_with_title: 公告類別及標題
+      bulletin_category_with_title: 類別
       postdate: 張貼日期
       subtitle: 副標題
       title: 標題
@@ -27,6 +28,10 @@ zh_tw:
     frontend:
       bulletins: 公告前台
       search_result: 搜尋結果頁
+    image: 封面圖片
+    image_note: 此處上傳的圖片不會在公告內文出現
+    image_size_note: 系統限制上傳500k以下的圖片
+    image_limit: 圖片上傳容量限制為500kB
     link_name: 連結名稱
     new_bulletin_category: 新增公告類別
     picture: 刊頭圖片