From 5d47afdc438080d63948762088be72078ce78b8c Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 18 Dec 2015 09:46:28 +0800
Subject: [PATCH] =?UTF-8?q?issue=20=E5=88=A0=E9=99=A4=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E7=9A=84=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/issues_controller.rb |  2 +-
 app/views/issues/_edit.html.erb      |  6 +++---
 db/schema.rb                         | 10 +++-------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index a765963a9..a132ec295 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -24,7 +24,7 @@ class IssuesController < ApplicationController
   before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :destroy]
   before_filter :find_project, :only => [:new, :create, :update_form]
   #before_filter :authorize, :except => [:index, :show]
-  before_filter :authorize, :except => [:index,:add_journal, :add_journal_in_org]
+  before_filter :authorize, :except => [:index,:add_journal, :add_journal_in_org,:delete_journal,:reply,:add_reply]
 
   before_filter :find_optional_project, :only => [:index]
   before_filter :check_for_default_issue_status, :only => [:new, :create]
diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb
index a1bde3981..529de3480 100644
--- a/app/views/issues/_edit.html.erb
+++ b/app/views/issues/_edit.html.erb
@@ -20,9 +20,9 @@
 
     </div>
     <input name="issue_quote_new" type="hidden" value="<%= %>" />
-    <fieldset><legend>回复</legend>
-    <%= f.kindeditor :notes, :style => "width:99%;",:height=>'100px', :cssData =>"blockquote { padding:0px}", :rows => "5", :no_label => true, :editor_id=>'issue_journal_kind_reply', at_id: @issue.id, at_type: @issue.class.to_s %>
-    </fieldset>
+    <!--<fieldset><legend>回复</legend>-->
+    <%#= f.kindeditor :notes, :style => "width:99%;",:height=>'100px', :cssData =>"blockquote { padding:0px}", :rows => "5", :no_label => true, :editor_id=>'issue_journal_kind_reply', at_id: @issue.id, at_type: @issue.class.to_s %>
+    <!--</fieldset>-->
     <!--<%# if @issue.safe_attribute? 'private_notes' %>-->
     <!--<label for="issue_private_notes"><%#= f.check_box :private_notes, :no_label => true %> <%#= l(:field_private_notes) %></label>-->
     <!--<%# end %>-->
diff --git a/db/schema.rb b/db/schema.rb
index df2b94ae9..c0d4da2f8 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -70,11 +70,11 @@ ActiveRecord::Schema.define(:version => 20151217051447) do
     t.integer  "user_id"
     t.integer  "at_message_id"
     t.string   "at_message_type"
-    t.boolean  "viewed"
+    t.boolean  "viewed",          :default => false
     t.string   "container_type"
     t.integer  "container_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
     t.integer  "sender_id"
   end
 
@@ -1640,10 +1640,6 @@ ActiveRecord::Schema.define(:version => 20151217051447) do
     t.string   "extra"
   end
 
-  create_table "temp", :id => false, :force => true do |t|
-    t.integer "id", :default => 0, :null => false
-  end
-
   create_table "time_entries", :force => true do |t|
     t.integer  "project_id",  :null => false
     t.integer  "user_id",     :null => false