From 25a604d7b8d49b9bf5f75d2559a786010c57823c Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 24 Sep 2015 16:59:19 +0800 Subject: [PATCH] =?UTF-8?q?issue=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/show.html.erb | 118 ++++++++------------------------- db/schema.rb | 13 +++- 2 files changed, 38 insertions(+), 93 deletions(-) diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 2b706be7f..76467275d 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -1,4 +1,4 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor", '/assets/kindeditor/pasteimg' %>

<%= l(:label_issue_edit) %>

@@ -12,7 +12,6 @@
<%= link_to image_tag(url_to_avatar(@issue.author), :width => 46, :height => 46), user_path(@issue.author), :class => "ping_dispic" %>
-

@@ -21,59 +20,32 @@


- 由<%= @issue.author %>添加于 <%= format_time(@issue.created_on).html_safe %> +

由<%= @issue.author %> + <%# if @issue.created_on != @issue.updated_on %> + 添加于 <%= format_time(@issue.created_on).html_safe %> + <%# else %> + <%#= format_time(@issue.updated_on).html_safe %> + <%# end %>

- 'action_menu' %>
- <% if @issue.description? || @issue.attachments.any? -%> -
+
+ <% if @issue.description? || @issue.attachments.any? -%> <% if @issue.description? %> <%#= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %> <%= textAreailizable @issue, :description, :attachments => @issue.attachments %> <% end %> -
- <% end -%> - -
- - - <%= link_to_attachment_project @issue, :thumbnails => true %>
+
+
+ + + <%= link_to_attachment_project @issue, :thumbnails => true %>
+ <% end -%> <%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %> -
-
- - -<<<<<<< .mine - <%= render :partial => 'attributes_show' %> - - - - - - - - - - - - - - - - - - - - - - - - - - -======= +
+
+
<%= issue_fields_rows do |rows| %> ->>>>>>> .theirs -<<<<<<< .mine - <%# 该应用是对issue主题内容的引用，对应:to => 'journals#new %> - - - - - - -
-=======
- + + +
+ <%= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'talk_edit fr' if authorize_for('issues', 'edit') %> +
+
- <% if @issue.editable? %>
<%= render :partial => 'edit' %>

- <%#--引用时不能修改，剥离出引用内容--%> + + + <%= l(:button_submit) %> <% end %> + <%#= submit_tag l(:button_submit) %> <%#= preview_link preview_edit_issue_path(:project_id => @project, :id => @issue), 'issue-form' ,'preview',{:class => "blue_btn fr mr10"}%> @@ -199,7 +138,6 @@ <%= render :partial => 'changesets', :locals => {:changesets => @changesets} %> <% end %> -
<% other_formats_links do |f| %> <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %> diff --git a/db/schema.rb b/db/schema.rb index 40daded12..b364ed83e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20150918134804) do +ActiveRecord::Schema.define(:version => 20150924063215) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -476,6 +476,13 @@ ActiveRecord::Schema.define(:version => 20150918134804) do add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority" + create_table "discuss_demos", :force => true do |t| + t.string "title" + t.text "body" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "documents", :force => true do |t| t.integer "project_id", :default => 0, :null => false t.integer "category_id", :default => 0, :null => false @@ -895,6 +902,7 @@ ActiveRecord::Schema.define(:version => 20150918134804) do t.datetime "updated_on", :null => false t.boolean "locked", :default => false t.integer "sticky", :default => 0 + t.integer "reply_id" end add_index "messages", ["author_id"], :name => "index_messages_on_author_id" @@ -912,7 +920,6 @@ ActiveRecord::Schema.define(:version => 20150918134804) do t.datetime "created_on" t.integer "comments_count", :default => 0, :null => false t.integer "course_id" - t.datetime "updated_on" end add_index "news", ["author_id"], :name => "index_news_on_author_id" @@ -1324,7 +1331,7 @@ ActiveRecord::Schema.define(:version => 20150918134804) do t.datetime "updated_at", :null => false t.integer "late_penalty", :default => 0 t.integer "absence_penalty", :default => 0 - t.float "system_score", :default => 0.0 + t.integer "system_score" t.boolean "is_test", :default => false end