+ <%= render :partial => "files/subfield_tags", :locals => {:tag_list => @tag_list,:org_subfield => @org_subfield,:tag_name => @tag_name}%>
+
diff --git a/app/views/files/_subfield_files.html.erb b/app/views/files/_subfield_files.html.erb
index 2a552dc43..09f74d3cd 100644
--- a/app/views/files/_subfield_files.html.erb
+++ b/app/views/files/_subfield_files.html.erb
@@ -15,9 +15,9 @@
{
switch(obj)
{
- case 1:
- $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 1}) %>');
- break;
+// case 1:
+// $('#ajax-modal').html('<%#= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 1}) %>');
+// break;
case 2:
$('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 2}) %>');
break;
@@ -27,9 +27,9 @@
case 4:
$('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 4}) %>');
break;
- case 6:
- $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 6}) %>');
- break;
+// case 6:
+// $('#ajax-modal').html('<%#= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 6}) %>');
+// break;
default:
$('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 5}) %>');
}
@@ -77,11 +77,11 @@
上传：
- 课件 |
+
软件 |
媒体 |
代码 |
- 论文 |
+
其他
<%# end %>
diff --git a/app/views/files/_subfield_tags.html.erb b/app/views/files/_subfield_tags.html.erb
new file mode 100644
index 000000000..1a2c896fc
--- /dev/null
+++ b/app/views/files/_subfield_tags.html.erb
@@ -0,0 +1,43 @@
+<% if org_subfield && tag_list && tag_list.empty? == false%>
+
+ 全部
+<% end %>
+<% unless tag_list.nil?%>
+ <% tag_list.each do |k,v|%>
+ <% if tag_name && tag_name == k%>
+
+
<%= k%>(<%= v%>)
+ <% else%>
+
+ <%= k%>(<%= v%>)
+ <% end%>
+ <% end%>
+<% end%>
+
+
\ No newline at end of file
diff --git a/app/views/files/_upload_subfield_file.html.erb b/app/views/files/_upload_subfield_file.html.erb
index 567309f9c..7137e14e7 100644
--- a/app/views/files/_upload_subfield_file.html.erb
+++ b/app/views/files/_upload_subfield_file.html.erb
@@ -7,19 +7,17 @@
<%= l(:label_file_upload_error_messages)%>
<%= form_tag(org_subfield_files_path(org_subfield, :in_org => params[:in_org]), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
-
-
-
-
-
-
-
-
-
-
-
-
-
+ <% if params[:in_org] %>
+
+ 软件 |
+ 媒体 |
+ 代码 |
+ 其他
+
+ <% else %>
+
+ <% end %>
+
<%= render :partial => 'files/attachement_list'%>
<%= l(:button_cancel)%>
diff --git a/app/views/files/search_org_subfield_tag_attachment.js.erb b/app/views/files/search_org_subfield_tag_attachment.js.erb
new file mode 100644
index 000000000..deed2d5d3
--- /dev/null
+++ b/app/views/files/search_org_subfield_tag_attachment.js.erb
@@ -0,0 +1,2 @@
+$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'org_subfield_list',
+ :locals => {org_subfield: @org_subfield,all_attachments: @result,sort:@sort,order:@order,org_subfield_attachments:@searched_attach})%>");
\ No newline at end of file
diff --git a/app/views/tags/remove_tag_new.js.erb b/app/views/tags/remove_tag_new.js.erb
index 9a43dd9b4..879155aa7 100644
--- a/app/views/tags/remove_tag_new.js.erb
+++ b/app/views/tags/remove_tag_new.js.erb
@@ -3,8 +3,12 @@
$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/tag_list',
:locals => {:obj => @obj,:non_list_all => false,:object_flag => @object_flag,:select_tag_name => @select_tag_name}) %>');
+<% if @org_subfield %>
+ $("#files_tag").html("<%= escape_javascript(render :partial => "files/subfield_tags", :locals => {:tag_list => @tag_list,:org_subfield => @org_subfield,:tag_name => @tag_name})%>");
+<% else %>
+ $("#files_tag").html("<%= escape_javascript(render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => @course,:tag_name => @select_tag_name}) %>");
+<% end %>
-$("#files_tag").html("<%= escape_javascript(render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => @course,:tag_name => @select_tag_name}) %>");
<% end %>
<% if @object_flag == "10"%>
$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
diff --git a/config/routes.rb b/config/routes.rb
index 05507d024..28a3fec70 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -77,7 +77,7 @@ RedmineApp::Application.routes.draw do
match "getattachtype", :via => [:get, :post]
match "search_files_in_subfield",:via => [:post,:get]
match "searchone4reload",:via => [:post,:get]
- match "search_tag_attachment", :via => [:post,:get]
+ match "search_org_subfield_tag_attachment", :via => [:post,:get]
match "subfield_upload_file", :via => :post
end
member do
From ef2f142f626d7162116fee4d8fb2cdc7708b28cc Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 15 Dec 2015 18:12:32 +0800
Subject: [PATCH 15/41] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E8=B5=84=E6=BA=90?=
=?UTF-8?q?=E5=85=81=E8=AE=B8=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/helpers/application_helper.rb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index aed57010b..81d42c1e6 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1936,6 +1936,8 @@ module ApplicationHelper
candown = true
elsif attachment.container.class.to_s=="BlogComment" #博客资源允许下载
candown = true
+ elsif attachment.container.class.to_s=="Memo" #论坛资源允许下载
+ candown = true
elsif attachment.container.class.to_s == "User"
candown = (attachment.is_public == 1 || attachment.is_public == true || attachment.author_id == User.current.id)
elsif attachment.container_type == "Bid" && attachment.container && attachment.container.courses
From 68aceaa7dfbdbd68bfde084fca7fc6402b4ecaf4 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 15 Dec 2015 18:43:58 +0800
Subject: [PATCH 16/41] =?UTF-8?q?issue=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/issues_controller.rb | 4 +
app/views/issues/_action_menu.html.erb | 4 +-
app/views/issues/_attributes.html.erb | 5 +-
app/views/issues/_attributes_show.html.erb | 2 +-
app/views/issues/_detail.html.erb | 36 +++++
app/views/issues/_edit.html.erb | 38 ++---
app/views/issues/_form.html.erb | 2 +-
app/views/issues/_issue_replies.html.erb | 34 +++++
app/views/issues/add_journal.js.erb | 11 +-
app/views/issues/show.html.erb | 143 ++++++------------
app/views/issues/update.js.erb | 5 +
.../lib/rails_kindeditor/helper.rb | 8 +-
public/assets/kindeditor/kindeditor.js | 28 ++--
.../plugins/autoheight/autoheight.js | 4 +-
public/javascripts/project.js | 10 ++
public/stylesheets/project.css | 15 +-
public/stylesheets/public.css | 3 +-
17 files changed, 202 insertions(+), 150 deletions(-)
create mode 100644 app/views/issues/_detail.html.erb
create mode 100644 app/views/issues/_issue_replies.html.erb
create mode 100644 app/views/issues/update.js.erb
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 7cdc838e2..9bb602178 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -256,6 +256,7 @@ class IssuesController < ApplicationController
end
flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record?
respond_to do |format|
+ format.js
format.html { redirect_to issue_url(@issue.id) }
format.api { render_api_ok }
end
@@ -398,6 +399,9 @@ class IssuesController < ApplicationController
user_activity.updated_at = jour.created_on
user_activity.save
@user_activity_id = params[:user_activity_id]
+ if params[:issue_id]
+ @issue_id = params[:issue_id]
+ end
respond_to do |format|
format.js
end
diff --git a/app/views/issues/_action_menu.html.erb b/app/views/issues/_action_menu.html.erb
index ae2a848e0..97e95d4a9 100644
--- a/app/views/issues/_action_menu.html.erb
+++ b/app/views/issues/_action_menu.html.erb
@@ -2,5 +2,5 @@
<%#= watcher_link_issue(@issue, User.current) %>
<%= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'talk_edit fr' if User.current.allowed_to?(:add_issues, @project) %>
<%= link_to l(:button_delete), issue_path(@issue.id), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, :method => :delete, :class => 'talk_edit fr' if User.current.allowed_to?(:delete_issues, @project) %>
-<%= link_to l(:button_edit), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("all_attributes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:edit_issues, @project) %>
-<%= link_to l(:label_user_newfeedback), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("update", "issue_journal_kind_reply"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:add_issue_notes, @project) %>
+<%= link_to l(:button_edit), 'javascript:void(0);', :onclick => 'issueEditShow();', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:edit_issues, @project) %>
+<%#= link_to l(:label_user_newfeedback), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("update", "issue_journal_kind_reply"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:add_issue_notes, @project) %>
diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb
index 54cb85212..1b6bebb01 100644
--- a/app/views/issues/_attributes.html.erb
+++ b/app/views/issues/_attributes.html.erb
@@ -1,7 +1,6 @@
<%= labelled_fields_for :issue, @issue do |f| %>
-