Merge branch 'design_team' into ldap

Conflicts: vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
2012-05-22 20:33:07 +08:00
commit f1c8bed29d
@@ -20,8 +20,8 @@ class Panel::Announcement::BackEnd::ApprovalsController  < OrbitBackendControlle
    else
      @bulletin_category =  @bulletin_categorys.first
    end
-    preload_object_auth = @bulletin_category.object_auths.where(title: 'fact_check').empty?? (@bulletin_category.object_auths.create! :title=> 'fact_check') : @bulletin_category.object_auths.where(title: 'fact_check')
-    @users_array =  preload_object_auth.first.privilege_users rescue []
+    preload_object_auth = @bulletin_category.get_object_auth_by_title('fact_check')
+    @users_array =  preload_object_auth.privilege_users rescue []
    respond_to do |format|
      format.html
      format.js
@@ -31,9 +31,9 @@ class Panel::Announcement::BackEnd::ApprovalsController  < OrbitBackendControlle
  def update_setting
    object_auth = update_setting_by_params
    if object_auth.save!
-      flash[:notice] = "Update Done"
+      flash[:notice] = t("admin.object_auth.update_done")
    else
-      flash[:notice] = "Update Failed"
+      flash[:notice] = t("admin.object_auth.update_failed")
    end
  end
  
@@ -36,7 +36,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController


    # @bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered_bulletins : Bulletin.all.page(params[:page]).per(10)
-    @bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered("bulletin") : Bulletin.all.page(params[:page]).per(10)
+    @bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered("bulletin") : get_viewable("bulletin")
  	@bulletin_categories = BulletinCategory.all

    @bulletin_link = BulletinLink.new
@@ -44,12 +44,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 	
    @bulletin_file = BulletinFile.new
    @file_url = panel_announcement_back_end_bulletins_path
-	
-    if(!is_admin? || !is_manager?)
-      @bulletins.delete_if{ |bulletin|
-              bulletin.is_pending == true && ((!bulletin.bulletin_category.authed_users('fact_check').include?(current_user) rescue nil) || bulletin.create_user_id!=current_user.id)
-            }
-        end
    
    respond_to do |format|
      format.html # index.html.erb
@@ -38,7 +38,6 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
  def preview_content
    @bulletin = Bulletin.find params[:id]
    get_categorys
-    render :show
  end
  
  protected
@@ -160,13 +160,13 @@ class Bulletin
  protected
  
  def set_key
-    if title.new_record?
+    if title && title.new_record?
      title.key = 'title'
    end
-    if subtitle.new_record?
+    if subtitle && subtitle.new_record?
      subtitle.key = 'subtitle'
    end
-    if text.new_record?
+    if text && text.new_record?
      text.key = 'text'
    end
  end
@@ -29,10 +29,10 @@ class BulletinFile
  protected
  
  def set_key
-    if filetitle.new_record?
+    if filetitle && filetitle.new_record?
      filetitle.key = 'filetitle'
    end
-    if description.new_record?
+    if description && description.new_record?
      description.key = 'description'
    end
  end  
@@ -16,11 +16,9 @@
                <%= select "category",'id',@options_from_collection_for_select_bulletin_categorys %>
 								<%= search_field_tag 'user_filter' %>
            </div>
-
        </li>
    </ul>
 		<%= link_to t("announcement.bulletin.approval_user_list"), panel_announcement_back_end_approval_user_list_path , :class=>'preview_trigger btn btn-success pull-right'%>	
-
 </div>
 <%#= label_tag :role, t("admin.roles") %>
 <div class="clear">
@@ -60,8 +60,8 @@
 			</ul>
 		</div>
 	</td>
-	<td><%= bulletin.postdate %></td>
-	<td><%= (bulletin.deadline) ? bulletin.deadline : t('bulletin.no_deadline') %></td>
+	<td><%= display_date_time(bulletin.postdate) %></td>
+	<td><%= (bulletin.deadline) ? display_date_time(bulletin.deadline ): t('bulletin.no_deadline') %></td>
 	<td>
 		<div class="label-group">
 			<div class="label-td">
@@ -5,7 +5,7 @@
 	</li>
 	<li>
  <b><%= t('announcement.postdate') %></b>
-  <%= @bulletin.postdate %>
+  <%= display_date_time(@bulletin.postdate) %>
 	</li>
 	<li>
  <b><%= t('announcement.title') %></b>
@@ -42,7 +42,7 @@
 	</li>
 	<li>
  <b><%= t('announcement.最後修改時間') %></b>
-  <%= @bulletin.updated_at %>
+  <%= display_date(@bulletin.updated_at) %>
 	</li>


@@ -22,7 +22,7 @@
 	<td><%= link_to post.title[I18n.locale], panel_announcement_front_end_bulletin_path(post, :category_id => post.bulletin_category_id) %>
 	<%#= link_to post.title, panel_announcement_back_end_bulletin_path(post) %>
 	</td>
-	<td><%= post.postdate %></td>
+	<td><%= display_date_time(post.postdate) %></td>
  </tr>
  
 <% end %>
@@ -2,10 +2,11 @@
 <h1 class="h1"><%= @bulletin.title[I18n.locale] %></h1>
 <div class="info">
 	<div class="info1">
-		<span class="date"><%= @bulletin.postdate %></span>
-		&nbsp;|&nbsp;
-		<a href="" class="unit"><%= User.find(@bulletin.create_user_id).sub_roles.collect{|t| t.key}.join(" ") rescue '' %></a>
-		<span><%= dislpay_view_count(@bulletin) %></span>
+		<span class="pull-right"><%= dislpay_view_count(@bulletin) %></span>
+		<span class="date"><%= display_date_time(@bulletin.postdate) %></span>
+		<% unit = User.find(@bulletin.create_user_id).sub_roles.collect{|t| t.key}.join(" ") rescue nil %>
+		<%= " | " if unit %>
+		<a href="" class="unit"><%= unit %></a>
 	</div>
 </div>
 <div class="news_image">
@@ -15,7 +15,7 @@
 	<td><%= post.bulletin_category.i18n_variable[I18n.locale] rescue nil %></td>
 	<td><%= link_to post.title[I18n.locale], panel_announcement_front_end_bulletin_path(post, :category_id => post.bulletin_category_id) %>
 	</td>
-	<td><%= post.postdate %></td>
+	<td><%= display_date_time(post.postdate) %></td>
  </tr>
  
 <% end %>
@@ -4,7 +4,7 @@ class Panel::News::BackEnd::NewsApprovalsController  < OrbitBackendController
  include AdminHelper
  
  def preview_and_approve
-    @news_bulletin = NewsBulletin.find params[:news_bulletin_id]
+    @news_bulletin = NewsBulletin.find params[:news_category][:id]
  end
  
  def approve
@@ -14,20 +14,14 @@ class Panel::News::BackEnd::NewsApprovalsController  < OrbitBackendController
  def setting
    @sys_users = User.all(conditions: {admin: false})
    @news_bulletin_categorys = NewsBulletinCategory.all
-    if params.has_key?(:category_id)
-      first_category = NewsBulletinCategory.find params[:category_id]
-      if params[:commit] == 'Update'
-        privilege_users = params[:users].collect{|key,value| User.find key }  rescue []
-        preload_object_auth_ary = first_category.object_auths.where(title: 'fact_check') || (first_category.object_auths.create :title=> 'fact_check')
-        preload_object_auth = preload_object_auth_ary.first
-        preload_object_auth.privilege_users = privilege_users
-        preload_object_auth.save!
-      end
+    @options_from_collection_for_select_news_bulletin_categorys = @news_bulletin_categorys.collect{|bc| [bc.i18n_variable[I18n.locale],bc.id] }
+    if params.has_key? :news_category
+      @news_bulletin_categorys = NewsBulletinCategory.find params[:news_category][:id]
    else
-      first_category =  @news_bulletin_categorys.first
+      @news_bulletin_categorys =  @news_bulletin_categorys.first
    end  
-    preload_object_auth = first_category.object_auths.where(title: 'fact_check').empty?? (first_category.object_auths.create! :title=> 'fact_check') : first_category.object_auths.where(title: 'fact_check')
-    @users_array =  preload_object_auth.first.privilege_users rescue []
+    preload_object_auth = @news_bulletin_categorys.get_object_auth_by_title('fact_check')
+    @users_array =  preload_object_auth.privilege_users rescue []
    respond_to do |format|
      format.html
      format.js
@@ -35,10 +29,27 @@ class Panel::News::BackEnd::NewsApprovalsController  < OrbitBackendController
  end
  
  def update_setting
-    
+    object_auth = update_setting_by_params
+    if object_auth.save!
+      flash[:notice] = t("admin.object_auth.update_done")
+    else
+      flash[:notice] = t("admin.object_auth.update_failed")
+    end
+  end
+
+  def user_list
+    @news_bulletin_category = NewsBulletinCategory.find params[:news_category][:id]
  end

  protected
+  def update_setting_by_params
+    category = NewsBulletinCategory.find params[:news_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 get_categorys(id = nil)
    @news_bulletin_categorys = []
@@ -41,10 +41,6 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController

    @news_bulletin_link = NewsBulletinLink.new
    @link_url = panel_news_back_end_news_bulletins_path
-	
-    @news_bulletins.delete_if{ |news_bulletin|
-      news_bulletin.is_pending == true && ((!news_bulletin.bulletin_category.authed_users('fact_check').include?(current_user) rescue nil) || news_bulletin.create_user_id!=current_user.id)
-    }

    @news_bulletin_file = NewsBulletinFile.new
    @file_url = panel_news_back_end_news_bulletins_path
@@ -36,9 +36,8 @@ class Panel::News::FrontEnd::NewsBulletinsController < OrbitWidgetController
  end
  
  def preview_content
-    @news_bulletins = NewsBulletin.find params[:id]
+    @news_bulletin = NewsBulletin.find params[:id]
    get_categorys
-    render :show
  end
  
  protected
@@ -2,7 +2,7 @@ module Panel::News::BackEnd::NewsBulletinsHelper
  
  def news_show_approval_link(news_bulletin)
    by_news_bulletin = (!news_bulletin.is_expired? and !news_bulletin.is_checked?)
-    by_user = (news_bulletin.news_bulletin_category.authed_users('fact_check').include?(current_user) rescue nil) or is_manager?
+    by_user = (news_bulletin.news_bulletin_category.authed_users('fact_check').include?(current_user) or is_manager? or is_admin?)
    by_news_bulletin and  by_user
  end

@@ -160,13 +160,13 @@ class NewsBulletin
  protected
  
  def set_key
-    if title.new_record?
+    if title && title.new_record?
      title.key = 'title'
    end
-    if subtitle.new_record?
+    if subtitle && subtitle.new_record?
      subtitle.key = 'subtitle'
    end
-    if text.new_record?
+    if text && text.new_record?
      text.key = 'text'
    end
  end
@@ -29,10 +29,10 @@ class NewsBulletinFile
  protected
  
  def set_key
-    if filetitle.new_record?
+    if filetitle && filetitle.new_record?
      filetitle.key = 'filetitle'
    end
-    if description.new_record?
+    if description && description.new_record?
      description.key = 'description'
    end
  end  
@@ -0,0 +1,44 @@
+<% if news_bulletin_category -%>
+
+<div class="modal hide fade in" id="news_bulletin_category-<%=news_bulletin_category.id%>">
+  <div class="modal-header">
+    <a class="close" data-dismiss="modal">×</a>
+    <h3><%= t("announcement.bulletin.approval_user_list") %></h3>
+  </div>
+  <div class="modal-body">
+    <div class="clear">
+      <% news_bulletin_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("modal.close") %></a>
+  </div>
+  <div>
+    <script type="text/javascript" src="/static/kernel.js"></script>
+    <script type="text/javascript">
+      $(document).ready(function() {
+  
+      $("#news_bulletin_category-<%=news_bulletin_category.id%>").on("show", function () {
+      });
+    $(".modal").on("hidden", function () {
+    $("#show_preview").remove();
+      });
+    });
+    </script>
+  </div>
+</div>
+
+
+
+<% end -%>
@@ -6,7 +6,7 @@
 				<% user.sub_roles.each do |sr| %>
 					<div class="for_unit" style="display:none;"> <%= sr.key %></div>
 				<% end %>
-				<%= content_tag :div,:data=>{'original-title'=>t('news.news_bulletin.approval_setting_window_title'),:content => "#{user.sub_roles.collect{|sr| sr.key}.join(',')}"},:class=>"checkbox clear" do %>
+				<%= content_tag :div,:data=>{'original-title'=>t('news.news_bulletin.approval_setting_window_title'),:content => "#{user.sub_roles.collect{|sr| sr.i18n_variable[I18n.locale]}.join(',')}"},:class=>"checkbox clear" do %>
 					<div class="check-icon">
 					</div>
 					<div class='member-avatar'>
@@ -4,27 +4,29 @@
 <% content_for :page_specific_javascript do %>
 	<%= javascript_include_tag "inc/permission-checkbox"  %>
 	<%= javascript_include_tag "inc/search"  %>
+      <%= javascript_include_tag "inc/modal-preview"  %>
 <% end %>
 <%#= label_tag :fact_check_setting, t("news.news_bulletin.fact_check_setting") %>
-<%= form_tag('', :remote => true)  %>
-<div class="subnav">
-    <ul class="nav nav-pills filter">
+<%= 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("news.news_bulletin.category") %>
-                <%= select_tag "category_id", options_from_collection_for_select(@news_bulletin_categorys, "id", "key") %>
+                <%= select "news_category",'id', @options_from_collection_for_select_news_bulletin_categorys %>
 								<%= search_field_tag 'user_filter' %>
            </div>
        </li>
    </ul>
+        <%= link_to t("announcement.bulletin.approval_user_list"), panel_news_back_end_approval_user_list_path , :class=>'preview_trigger btn btn-success pull-right'%> 
 </div>
 <%#= label_tag :role, t("admin.roles") %>
 <div class="clear">
 <%= content_tag :div do -%>
-	<% form_tag :action => "update_setting"  do %>
+	<% form_tag panel_news_back_end_approval_setting_path  do %>
 		<%= render :partial => "privilege_user", :locals => {:users => @users_array} %>
-	<div class="form-actions pagination-centered">
-	<%= submit_tag "Update", :class => 'btn' %>
+	<div class="form-actions form-fixed pagination-right">
+	<%= submit_tag "Update", :class => 'btn btn-primary' %>
 	</div>
 	<% end -%>
 <% end -%>
@@ -32,9 +34,21 @@

 <script type="text/javascript" charset="utf-8">
 var availableTags = [];
-$(function() {
-
-	$('#category_id').change(function() {
-	  $(this).parents('form').submit();
-	});
+$(document).ready(function() {
+  
+  $(".prevent_enter_submit_form").bind("keypress", function(e) {
+    if (e.keyCode == 13) {
+      return false;
+    }
+  });
+   
+  $('#news_category_id').change(function() {
+    $.ajax({
+      type: 'GET',
+      dataType: "script",
+      url:$(this).parents("from").attr("href"),
+      data:$(this).parents("form").serialize()
+    });
+  });
+});
 </script>
@@ -1 +1,2 @@
-$("#users_checkbox_ary").replaceWith('<%= (render :partial => 'privilege_user', :locals => {:users => @users_array}).html_safe%>');
+$("#users_checkbox_ary").replaceWith('<%= escape_javascript(render :partial => "privilege_user", :locals => {:users => @users_array})%>');
+permissionCheckbox();
@@ -0,0 +1 @@
+alert( "<% flash.each do |key, msg| %><%= msg %><% end%>");
@@ -0,0 +1,2 @@
+$('#show_preview').html("<%= escape_javascript(render(:partial => 'modal_list',:locals => {:news_bulletin_category => @news_bulletin_category})) %>");
+var start_modal_with_id = "news_bulletin_category-<%=@news_bulletin_category.id%>"
@@ -55,14 +55,14 @@
 					<li class="dropdown"><%= link_to t('news_bulletin.delete'), panel_news_back_end_news_bulletin_path(news_bulletin), :confirm => t('news.sure?'), :method => :delete, :remote => true %></li>	
 				<% end %>
 				<% if news_show_approval_link(news_bulletin) %>
-					<li><%= link_to t('news.news_bulletin.approval'), panel_news_back_end_news_bulletin_approval_preview_path(news_bulletin) ,:class=>"preview_trigger"  %></li><%#= #TODO add ancher so user can quick access into that part %>
+					<li><%= link_to t('news.news_bulletin.approval'), panel_news_back_end_news_bulletin_approval_preview_path(news_bulletin),:class => 'preview_trigger'   %></li><%#= #TODO add ancher so user can quick access into that part %>
 				<% end %>		
 				
 			</ul>
 		</div>
 	</td>
-	<td><%= news_bulletin.postdate %></td>
-	<td><%= (news_bulletin.deadline) ? news_bulletin.deadline : t('news_bulletin.no_deadline') %></td>
+	<td><%= display_date(news_bulletin.postdate) %></td>
+	<td><%= (news_bulletin.deadline) ? display_date(news_bulletin.deadline) : t('news_bulletin.no_deadline') %></td>
 	<td>
 		<div class="label-group">
 			<div class="label-td">
@@ -5,7 +5,7 @@
 	</li>
 	<li>
  <b><%= t('news.postdate') %></b>
-  <%= @news_bulletin.postdate %>
+  <%= display_date(@news_bulletin.postdate) %>
 	</li>
 	<li>
  <b><%= t('news.title') %></b>
@@ -42,7 +42,7 @@
 	</li>
 	<li>
  <b><%= t('news.最後修改時間') %></b>
-  <%= @news_bulletin.updated_at %>
+  <%= display_date(@news_bulletin.updated_at) %>
 	</li>


@@ -17,12 +17,12 @@
 		</tr>
 		<% @news_bulletins.each do |post| %>
 		<tr>
-			<td><%= image_tag post.image %></td>
+			<td><%= image_tag post.image rescue nil %></td>
 			<td>
 				<%= link_to post.title[I18n.locale], panel_news_front_end_news_bulletin_path(post), :class => 'news_title' %>
 				<%= post.subtitle[I18n.locale].html_safe %>
 			</td>
-			<td><%= post.postdate %></td>
+			<td><%= display_date(post.postdate) %></td>
 		</tr>
 		<% end %> 
 	</tbody>
@@ -3,9 +3,10 @@
 <div class="info">
 	<div class="info1">
 		<span class="pull-right"><%= dislpay_view_count(@news_bulletin) %></span>
-		<span class="date"><%= @news_bulletin.postdate %></span>
-		&nbsp;|&nbsp;
-		<a href="" class="unit"><%= @news_bulletin.unit_list_for_anc.title[I18n.locale] rescue '' %></a>
+		<span class="date"><%= display_date(@news_bulletin.postdate) %></span>
+		<% unit = @news_bulletin.unit_list_for_anc.title[I18n.locale] rescue nil %>
+		<%= " | " if unit %>
+		<a href="" class="unit"><%= unit %></a>
 	</div>
 </div>
 <div class="news_image">
@@ -18,7 +18,7 @@
 				<%= link_to post.title[I18n.locale], panel_news_front_end_news_bulletin_path(post), :class => 'news_title' %>
 				<%= post.subtitle[I18n.locale].html_safe %>
 			</td>
-			<td><%= post.postdate %></td>
+			<td><%= display_date(post.postdate) %></td>
 		</tr>
 		<% end %> 
 	</tbody>
@@ -2,9 +2,10 @@ Rails.application.routes.draw do
  namespace :panel do
    namespace :news do
      namespace :back_end do
-        match 'news_approval_setting' => "news_approvals#setting" ,:as => :news_approval_setting
-        match 'update_setting' => "news_approvals#update_setting" ,:as => :news_approval_update_setting
-        
+        match 'public' => "news#public",:as => :public
+        match 'approval_setting' => "news_approvals#setting" ,:as => :approval_setting,:via => :get
+        match 'approval_setting' => "news_approvals#update_setting" ,:as => :approval_setting,:via => :post
+        match 'approval_setting' => "news_approvals#user_list" ,:as => :approval_user_list,:via => :put        
        resources :news_bulletins do
          match "approve/:news_bulletin_id"  => "news_approvals#preview_and_approve",:as => :approval_preview,:via => :put
          match "approve/:news_bulletin_id"  => "news_approvals#approve",:as => :approve,:via => :post
@@ -18,6 +18,6 @@
 			<%= link_to page_context.version, panel_page_content_back_end_view_path(page_context.page_id) %>
 		<%end -%>
 	</td>
-	<td><%= page_context.updated_at.strftime("%Y-%m-%d %H:%I:%S") %></td>
+	<td><%= display_date_time(page_context.updated_at) %></td>
 	<td><%= User.find(page_context.create_user_id).name %></td>
 </tr>
@@ -10,6 +10,6 @@
 					</div>
 				</td>
 				<td><%= view_page_context.version %></td>
-				<td><%= view_page_context.updated_at.strftime("%Y-%m-%d %H:%I:%S") %></td>
+				<td><%= display_date(view_page_context.updated_at) %></td>
 				<td><%= User.find(view_page_context.create_user_id).name %></td>
 			</tr>
@@ -21,7 +21,7 @@
 	</li>
 	<li>
 		<b><%= t('page_content.最後修改時間') %></b>
-		<%= @page_context.updated_at.strftime("%Y-%m-%d %H:%I:%S") %>
+		<%= display_date(@page_context.updated_at) %>
 	</li>


@@ -69,10 +69,10 @@ class WebLink
  protected
  
  def set_key
-    if name.new_record?
+    if name && name.new_record?
      name.key = 'name'
    end
-    if context.new_record?
+    if context && context.new_record?
      context.key = 'context'
    end
  end
@@ -13,7 +13,7 @@
 	</li>
 	<li>
  <b><%= t('announcement.postdate') %></b>
-  <%= @bulletin.postdate %>
+  <%= display_date(@bulletin.postdate) %>
 	</li>
 	<li>
  <b><%= t('announcement.title') %></b>
@@ -50,7 +50,7 @@
 	</li>
 	<li>
  <b><%= t('announcement.最後修改時間') %></b>
-  <%= @bulletin.updated_at %>
+  <%= display_date(@bulletin.updated_at) %>
 	</li>


@@ -13,7 +13,7 @@
 	</li>
 	<li>
  <b><%= t('announcement.postdate') %></b>
-  <%= @bulletin.postdate %>
+  <%= display_date(@bulletin.postdate) %>
 	</li>
 	<li>
  <b><%= t('announcement.title') %></b>
@@ -50,7 +50,7 @@
 	</li>
 	<li>
  <b><%= t('announcement.最後修改時間') %></b>
-  <%= @bulletin.updated_at.strftime("%Y-%m-%d %H:%I:%S") %>
+  <%= display_date_time(@bulletin.updated_at) %>
 	</li>


@@ -38,10 +38,13 @@ module Impressionist
    end

    def update_impressionist_counter_cache
+      # cache_options = self.class.impressionist_counter_cache_options
+      # column_name = cache_options[:column_name].to_sym
+      # count = cache_options[:unique] ? impressionist_count(:filter => :ip_address) : impressionist_count
+      # update_attribute(column_name, count)
      cache_options = self.class.impressionist_counter_cache_options
      column_name = cache_options[:column_name].to_sym
-      count = cache_options[:unique] ? impressionist_count(:filter => :ip_address) : impressionist_count
-      update_attribute(column_name, count)
+      update_attribute(column_name, self.send(cache_options[:column_name]) + 1)
    end

    # OLD METHODS - DEPRECATE IN V0.5
@@ -27,11 +27,13 @@ class Impression
  private

  def update_impressions_counter_cache
-    impressionable_class = self.impressionable_type.constantize
+    if self.referrer
+      impressionable_class = self.impressionable_type.constantize

-    if impressionable_class.impressionist_counter_cache_options
-      resouce = impressionable_class.find(self.impressionable_id)
-      resouce.try(:update_impressionist_counter_cache)
+      if impressionable_class.impressionist_counter_cache_options
+        resouce = impressionable_class.find(self.impressionable_id)
+        resouce.try(:update_impressionist_counter_cache)
+      end
    end
  end
 end
				`@@ -0,0 +1 @@`
				`alert( "<% flash.each do \|key, msg\| %><%= msg %><% end%>");`