组织模块访问统计修改

app/controllers/organizations_controller.rb

@@ -84,9 +84,6 @@ class OrganizationsController < ApplicationController
 
         @subfield_content = @organization.org_subfields.order("priority")
         @organization = Organization.find(params[:id])
-        # 统计访问量
-        @organization.update_column(:visits, @organization.visits.to_i + 1)
-
           # @org_subfield = OrgSubfield.find(params[:org_subfield_id])
           # @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
           # @org_acts = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{@org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{@org_subfield.id})").order('updated_at desc').page(params[:page] || 1).per(10)
@@ -123,8 +120,6 @@ class OrganizationsController < ApplicationController
     else
       if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
         @organization = Organization.find(params[:id])
-        # 统计访问量
-        @organization.update_column(:visits, @organization.visits.to_i + 1)
         if params[:org_subfield_id]
           @org_subfield = OrgSubfield.find(params[:org_subfield_id])
           @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0

app/views/layouts/base_org.html.erb

@@ -113,6 +113,9 @@
         <!--<span class="img_private"><%#= l(:label_private)%></span>-->
         <!--<%# end %>-->
         <!--</div>-->
+        <%# 更新访问数,刷新的时候更新访问次数 %>
+        <%  update_visiti_count @organization %>
+        <%# over %>
 
         <div class="cl"></div>
         <div class="f12 fontGrey3">

app/views/layouts/base_org_newstyle.html.erb

@@ -62,9 +62,9 @@
 
 <!--add by huang-->
 <script type="text/javascript">
-    function orge_new_files_upload()
+    function org_new_files_upload()
     {
-        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files',:locals => {:org => @organization, :org_attachment_type => 1}) %>');
+        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files',:locals => {:org => @organization, :org_attachment_type => 0}) %>');
         showModal('ajax-modal', '513px');
         $('#ajax-modal').siblings().remove();
         $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
@@ -72,7 +72,7 @@
         $('#ajax-modal').parent().addClass("popbox_polls");
     }
 
-    function orge_new_files_banner_upload()
+    function org_new_files_banner_upload()
     {
         $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files_banner',:locals => {:org => @organization, :org_attachment_type => 1}) %>');
         showModal('ajax-modal', '513px');
@@ -89,12 +89,20 @@
     <div class="header-con">
       <% if User.current.admin_of_org?(@organization) %>
           <div class="logo fl">
-            <a class="logo-img"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
+            <% if @org_logo_attchment.blank? %>
-            <a href="" class="logo-add" title="点击替换LOGO" onclick="orge_new_files_upload();"></a>
+                <a class="logo-img"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
+            <% else %>
+                <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" class="logo-img">
+            <% end %>
+            <a href="#" class="logo-add" title="点击替换LOGO" onclick="org_new_files_upload();"></a>
           </div>
        <% else %>
           <div class="logo fl">
-            <a class="logo-img"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
+            <% if @org_logo_attchment.blank? %>
+                <a class="logo-img"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
+            <% else %>
+                <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" class="logo-img">
+            <% end %>
           </div>
        <% end %>
       <%= render :partial => 'organizations/org_logined_header' %>
@@ -140,7 +148,7 @@
           <% else %>
               <img src="/attachments/<%= @org_banner_attchment.id %>/<%= @org_banner_attchment.filename %>" class="banner-img">
           <% end %>
-          <a href="#" class="banner-add" title="点击替换图片" onclick="orge_new_files_banner_upload();"></a>
+          <a href="#" class="banner-add" title="点击替换图片" onclick="org_new_files_banner_upload();"></a>
           <div class="banner-txt">
             <p ><%= @organization.name  %></p>
           </div>
@@ -389,6 +397,9 @@
       <% end %>
   <% end %>
 
+  <%# 更新访问数,刷新的时候更新访问次数 %>
+  <%  update_visiti_count @organization %>
+  <%# over %>
 
   <div class="footer">
     <div class="footer-con">