Merge branch 'hjq_beidou' into develop

app/controllers/sub_document_comments_controller.rb

@@ -1,7 +1,7 @@
 class SubDocumentCommentsController < ApplicationController
   before_filter :find_subdomain_and_subfield, :only => [:new, :create, :show, :index, :destroy, :edit]
   before_filter :find_subfield_content, :only => [:show, :index]
-  before_filter :authorize_allowed, :only => [:create]
+  before_filter :authorize_allowed, :only => [:create, :add_reply]
   helper :attachments,:organizations
   layout 'base_sub_domain'
 

app/helpers/application_helper.rb

@@ -1080,7 +1080,7 @@ module ApplicationHelper
       elsif @user
         title << @user.try(:realname)
       else
-        title << User.current.try(:realname)
+        title << (User.current.id == 2 ? "未登录" : User.current.try(:realname))
       end
       if first_page.nil? || first_page.web_title.nil?
         title << Setting.app_title unless Setting.app_title == title.last

app/views/sub_document_comments/_show_sub_document.html.erb

@@ -123,17 +123,20 @@
         <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_url_in_org(User.current.id) %>
       </div>
       <div class="homepagePostReplyInputContainer">
-        <div nhname='new_message_<%= act.id %>' style="display:none;">
+        <% if User.current.logged? %>
-          <%= form_for('new_form', :url => add_reply_org_subfield_sub_domain_sub_document_comment_path(:id => document.id, :act_id => act.id, :flag => flag), :method => "post", :remote => true) do |f| %>
+            <div nhname='new_message_<%= act.id %>' style="display:none;">
-              <input type="hidden" name="org_activity_id" value="<%= act.id %>"/>
+              <%= form_for('new_form', :url => add_reply_org_subfield_sub_domain_sub_document_comment_path(:id => document.id, :act_id => act.id, :flag => flag), :method => "post", :remote => true) do |f| %>
-              <div nhname='toolbar_container_<%= act.id %>'></div>
+                  <input type="hidden" name="org_activity_id" value="<%= act.id %>"/>
-              <textarea placeholder="有问题或建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= act.id %>' name="sub_content"></textarea>
+                  <div nhname='toolbar_container_<%= act.id %>'></div>
-              <a id="new_message_submit_btn_<%= act.id %>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;line-height:18px;">发送</a>
+                  <textarea placeholder="有问题或建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= act.id %>' name="sub_content"></textarea>
-
+                  <a id="new_message_submit_btn_<%= act.id %>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;line-height:18px;">发送</a>
-              <div class="cl"></div>
+                  <div class="cl"></div>
-              <p nhname='contentmsg_<%= act.id %>'></p>
+                  <p nhname='contentmsg_<%= act.id %>'></p>
-          <% end %>
+              <% end %>
-        </div>
+            </div>
+        <% else %>
+            <%= render :partial => "users/show_unlogged" %>
+        <% end %>
       </div>
       <div class="cl"></div>
     </div>

app/views/users/_show_unlogged.html.erb

@@ -0,0 +1,3 @@
+<div class="visitor-box fontGrey2">
+  <%= link_to "登录", signin_path, :class => "linkBlue", :target => "_blank" %>后可添加回复
+</div>

db/migrate/20160606064856_delete_anonymous_org.rb

@@ -0,0 +1,8 @@
+class DeleteAnonymousOrg < ActiveRecord::Migration
+  def up
+    OrgDocumentComment.where(:organization_id => 23, :creator_id => 2).delete_all
+  end
+
+  def down
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160601073753) do
+ActiveRecord::Schema.define(:version => 20160606064856) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false

public/stylesheets/org.css

@@ -178,3 +178,6 @@ a.teacher-select {font-size:13px; color:#fff; padding:3px 18px; background-color
 a.teacher-select:hover {background-color:#297fb8;}
 a.follow-button {font-size:13px; color:#272727; padding:3px 5px; background-color:#f2efef;}
 a.follow-button:hover {background-color:#c1c1c1;}
+
+/*组织未登录提示*/
+.visitor-box {width:620px; height:33px; line-height:33px; text-align:center; vertical-align: middle; border:1px solid #ccc; background-color: #fff;}

public/stylesheets/users.css

@@ -1,4 +1,7 @@
 #RSide{ min-height:1px;}
+
+
+
 /* 左侧信息*/
 .users_info{background:#fff; padding:10px; width:230px;  padding-right:0px; margin-bottom:10px; }
 .pic_head{ width:214px; height:214px; border:1px solid #cbcbcb; padding:2px; position:relative;}