From fcf34b5918152f4dcd99dbfa3ff01b8e502778e1 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 24 Sep 2015 16:38:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=AD=E2=80=9C=E7=A7=81=E6=9C=89=E2=80=9D?= =?UTF-8?q?=20=E2=80=9C=E5=85=AC=E5=BC=80=E2=80=9D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 1 + app/models/message.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 414ef6d70..251c47d4c 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -189,6 +189,7 @@ class ProjectsController < ApplicationController @project.organization_id = params[:organization_id] @project.user_id = User.current.id @project.project_new_type = params[:project_new_type] + params[:project][:is_public] ? @project.is_public = 1 : @project.is_public = 0 if validate_parent_id && @project.save @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id') # Add current user as a project member if he is not admin diff --git a/app/models/message.rb b/app/models/message.rb index 37129885f..2c46857f8 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -86,7 +86,7 @@ class Message < ActiveRecord::Base } - safe_attributes 'subject', 'content' + safe_attributes 'subject', 'content', 'reply_id' safe_attributes 'board_id','locked', 'sticky', :if => lambda {|message, user| if message.project From 25a604d7b8d49b9bf5f75d2559a786010c57823c Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 24 Sep 2015 16:59:19 +0800 Subject: [PATCH 2/3] =?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| %>
    @@ -101,18 +73,7 @@ <% end %>
->>>>>>> .theirs -<<<<<<< .mine - <%# 该应用是对issue主题内容的引用，对应:to => 'journals#new %> - - - - - - -
-=======
    <% unless @issue.disabled_core_fields.include?('start_date') %>

  •  开始  : 

    @@ -121,33 +82,6 @@
    • <% end %>
    ->>>>>>> .theirs -<<<<<<< .mine - - - - - - - - - - - - - - - - - - - - - - - - -======= <% unless @issue.disabled_core_fields.include?('estimated_hours') %>

  •  周期  : 

    <%= l_hours(@issue.estimated_hours) %> @@ -172,23 +106,28 @@ <% end %> <%#= render_custom_fields_rows(@issue) %> <%#= call_hook(:view_issues_show_details_bottom, :issue => @issue) %> ->>>>>>> .theirs -
- + + +
+ <%= 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 From b66de0ee9fe938fc57b5b5904c549deb1d1123da Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 24 Sep 2015 17:03:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?issue=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/show.html.erb | 111 ++++++++------------------------- 1 file changed, 26 insertions(+), 85 deletions(-) diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 76467275d..67867e2c6 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,6 +12,7 @@
<%= link_to image_tag(url_to_avatar(@issue.author), :width => 46, :height => 46), user_path(@issue.author), :class => "ping_dispic" %>
+

@@ -20,114 +21,53 @@


-

由<%= @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 %> + 由<%= @issue.author %>添加于 <%= format_time(@issue.created_on).html_safe %>

+ '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 %> -
-
- - - <%= link_to_attachment_project @issue, :thumbnails => true %>
- <% end -%> +
+ <% end -%> + +
+ + + <%= link_to_attachment_project @issue, :thumbnails => true %>
<%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %> -
-
- -
- <%= issue_fields_rows do |rows| %> -
    -

  •  状态  : 

    +
+
-

<%= @issue.status.name %>

- -
- <% unless @issue.disabled_core_fields.include?('assigned_to_id') %> -

  •  指派给  : 

    - <%= @issue.assigned_to ? link_to_isuue_user(@issue.assigned_to) : "--" %> -
    • - <% end %> -
    - -
      -

    •  优先级  : 

      - <%= @issue.priority.name %> -
      • -
      - <% unless @issue.disabled_core_fields.include?('done_ratio') %> -

    •  % 完成  : 

      - <%= @issue.done_ratio %>% -
      • - <% end %> -
      -
    + + <%= render :partial => 'attributes_show' %> + -
      - <% unless @issue.disabled_core_fields.include?('start_date') %> -

    •  开始  : 

      + <%# 该应用是对issue主题内容的引用，对应:to => 'journals#new %> + + +
      +
    -

    <%= format_date(@issue.start_date) %>

    - - <% end %> -
    - <% unless @issue.disabled_core_fields.include?('estimated_hours') %> -

  •  周期  : 

    - <%= l_hours(@issue.estimated_hours) %> -
    • - <% end %> -
    - -
      - <% unless @issue.disabled_core_fields.include?('due_date') %> -

    •  计划完成  : 

      - <%= format_date(@issue.due_date) ? format_date(@issue.due_date) : "--" %> -
      • - <% end %> -
      - <% unless @issue.disabled_core_fields.include?('fixed_version_id') %> -

    •  目标版本  : 

      - <%= (@issue.fixed_version ? link_to_version(@issue.fixed_version, :class => "pro_info_p") : "--") %> -
      • - <% end %> -
      -
    - <% end %> - <%#= render_custom_fields_rows(@issue) %> - <%#= call_hook(:view_issues_show_details_bottom, :issue => @issue) %> - - -
    - <%= 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"}%> @@ -138,6 +78,7 @@ <%= render :partial => 'changesets', :locals => {:changesets => @changesets} %> <% end %> +
    <% other_formats_links do |f| %> <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>