diff --git a/app/views/org_document_comments/new.html.erb b/app/views/org_document_comments/new.html.erb
index 11a7e9359..af938b498 100644
--- a/app/views/org_document_comments/new.html.erb
+++ b/app/views/org_document_comments/new.html.erb
@@ -1,24 +1,37 @@
<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%>
-<%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %>
+<%= form_tag organization_org_document_comments_path(:organization_id => @organization.id, :field_id => params[:field_id]), :id => 'new_org_document_form' do |f| %>
-
+
-
+
<%= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
@@ -29,9 +42,9 @@
diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb
index 7655f996e..7a64e4514 100644
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@@ -46,7 +46,7 @@
<%= link_to "编辑文章", edit_org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id, :flag => 1), :class => "postOptionLink" %>
- <%= link_to "删除文章", org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id), :method => 'delete',
+ <%= link_to "删除文章", org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id, :detail_page => 1), :method => 'delete',
:data => {:confirm => l(:text_are_you_sure)},
:remote => true, :class => 'postOptionLink' %>
diff --git a/app/views/org_subfields/_resource.html.erb b/app/views/org_subfields/_resource.html.erb
new file mode 100644
index 000000000..3cce9748f
--- /dev/null
+++ b/app/views/org_subfields/_resource.html.erb
@@ -0,0 +1,96 @@
+
+
+
+
+
+ <%= form_tag( search_course_files_path(@course), method: 'get',:class => "re_search f_l",:remote=>true) do %>
+ <%= text_field_tag 'name', params[:name], name: "name", :class => 're_schbox',:style=>"padding: 0px"%>
+ <%= submit_tag "课内搜索", :class => "re_schbtn b_lblue",:name => "incourse",:id => "incourse", :onmouseover => "presscss('incourse')",:onmouseout =>"buttoncss()" %>
+ <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %>
+ <% end %>
+ <% if is_course_teacher(User.current,@course) || (@course.publish_resource==1 && User.current.member_of_course?(@course) ) %>
+
+
+ 上传：
+ 课件 |
+ 软件 |
+ 媒体 |
+ 代码 |
+ 论文 |
+ 其他
+
+ <% end %>
+
+
+
+
+ <%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments} %>
+
+
+
+
+<% html_title(l(:label_attachment_plural)) -%>
\ No newline at end of file
diff --git a/app/views/org_subfields/create.js.erb b/app/views/org_subfields/create.js.erb
index 8a676e93e..f29799707 100644
--- a/app/views/org_subfields/create.js.erb
+++ b/app/views/org_subfields/create.js.erb
@@ -1,4 +1,5 @@
$("#org_subfield_list").html("");
$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list',:locals => {:subfields => @organization.org_subfields }) %>");
$("#sub_field_left_lists").html("");
-$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
\ No newline at end of file
+$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
+$("#subfield_name").val("");
\ No newline at end of file
diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb
index 9cb84e6d6..969c504da 100644
--- a/app/views/organizations/_org_activities.html.erb
+++ b/app/views/organizations/_org_activities.html.erb
@@ -22,7 +22,7 @@
<% end %>
<% if act.org_act_type == 'OrgDocumentComment' && act.org_act_id != @organization.home_id %>
- <%= render :partial => 'show_org_document', :locals => {:document => act.org_act, :act => act, :flag => 2} %>
+ <%= render :partial => 'show_org_document', :locals => {:document => act.org_act, :act => act, :flag => 2, :org_subfield_id => params[:org_subfield_id]} %>
<% end %>
<% end %>
<% if act.container_type == 'Project' %>
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index cb604f6ba..367c23843 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -25,8 +25,13 @@
<% organization.org_subfields.each do |field| %>
diff --git a/app/views/organizations/_org_member_list.html.erb b/app/views/organizations/_org_member_list.html.erb
index f67b25811..f5a277634 100644
--- a/app/views/organizations/_org_member_list.html.erb
+++ b/app/views/organizations/_org_member_list.html.erb
@@ -11,14 +11,10 @@
<%= radio_button_tag 'org_member[role_ids][]', role.id, member.roles.include?(role) %>
- <% if User.current.language == "zh" %>
- <% if role.id == 11 %>
-
- <% elsif role.id == 12 %>
-
- <% end %>
- <% else %>
-
+ <% if role.id == 11 %>
+
+ <% elsif role.id == 12 %>
+
<% end %>
diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb
index 7588c7f6f..2b0f11cdd 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -8,7 +8,7 @@
<%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %>
TO <%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue" %>
|
-
组织文章
+
<%= document.org_subfield_id.nil? ? "组织文章" :"#{OrgSubfield.find(document.org_subfield_id).name}" %>
<%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %>
@@ -27,12 +27,12 @@
-
- <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'set_homepage', :id => document.organization_id, :home_id => document.id}, :method => "put", :remote => true) do |f| %>
+ <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'set_homepage', :id => document.organization_id, :home_id => document.id, :show_homepage => 1}, :method => "put", :remote => true) do |f| %>
设为首页
<% end %>
-
- <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => flag), :class => "postOptionLink" %>
+ <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => flag, :org_subfield_id => params[:org_subfield_id] ), :class => "postOptionLink" %>
-
<%= link_to "删除文章", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete',
diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index a0f6dc60f..642a5ffd0 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -1,27 +1,26 @@
-
<% subfields.each do |field| %>
@@ -29,6 +28,7 @@
<%= field.name %>
- 新增
+ - <%= field.field_type == "Post" ? "帖子":"资源" %>
<%= link_to "删除",org_subfield_path(field), :method => 'delete',:remote => true, :confirm => "您确定删除吗？", :class => "linkBlue fr mr5" %>
编辑
diff --git a/app/views/organizations/set_homepage.js.erb b/app/views/organizations/set_homepage.js.erb
index b25c4c4d4..97824bb3a 100644
--- a/app/views/organizations/set_homepage.js.erb
+++ b/app/views/organizations/set_homepage.js.erb
@@ -1,2 +1,2 @@
//location.reload();
-window.location.href ='<%= organization_path(@org)%>'
\ No newline at end of file
+window.location.href ='<%= organization_path(@org, :show_homepage => 1)%>';
\ No newline at end of file
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index e0f262b99..4fc20653a 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -114,7 +114,18 @@
新增栏目
<%= form_tag url_for(:controller => 'org_subfields', :action => 'create', :organization_id => @organization.id), :id=> 'add_subfield_form',:remote => true do %>
-
+
+
确定
<% end %>
diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb
index 9ee9d11c0..3fb45376f 100644
--- a/app/views/organizations/show.html.erb
+++ b/app/views/organizations/show.html.erb
@@ -14,45 +14,47 @@
<% if params[:show_homepage].nil? %>
<% end %>
-<% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 %>
+<% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 and params[:org_subfield_id].nil? %>
\ No newline at end of file
diff --git a/config/locales/account/zh.yml b/config/locales/account/zh.yml
index c7c76707d..c6a23b964 100644
--- a/config/locales/account/zh.yml
+++ b/config/locales/account/zh.yml
@@ -52,7 +52,7 @@ zh:
label_mail_attention: "qq邮箱可能收不到此邮件，其他邮箱如果没有收到可能在垃圾邮件中，"
label_mail_attention1: "其中gmail与教育网邮箱的激活邮件有时比较慢，请耐心等待。"
# register中js判断密码设置是否合法提示信息
- setting_password_min_length_limit: "密码长度至少大于 %{count} 个字符。"
+ setting_password_min_length_limit: "密码长度至少大于等于 %{count} 个字符。"
setting_password_error: "密码长度不够或密码不一致"
setting_password_success: "密码设置成功"
# account_controller中register方法判断注册成功的提示信息
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 7ccbb8410..81b20a67e 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -921,6 +921,7 @@ zh:
button_rollback: 恢复到这个版本
button_reply: 回复
button_archive: 存档
+ button_delete_project: 删除项目
button_unarchive: 取消存档
button_reset: 重置
button_rename: 重命名/重定向
diff --git a/config/routes.rb b/config/routes.rb
index 0ef113d18..52fa393ad 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -46,6 +46,7 @@ RedmineApp::Application.routes.draw do
get 'search_projects'
post 'join_project_menu'
post 'join_projects'
+ post 'logout'
end
collection do
get 'check_uniq'
@@ -71,7 +72,17 @@ RedmineApp::Application.routes.draw do
end
resources :org_subfields do
-
+ resources :files, :only => [:index, :new, :create] do
+ collection do
+ match "getattachtype", :via => [:get, :post]
+ match "search",:via => [:post,:get]
+ match "searchone4reload",:via => [:post,:get]
+ match "search_tag_attachment", :via => [:post,:get]
+ end
+ member do
+ match "quote_resource_show", :via => [:get]
+ end
+ end
end
resources :org_document_comments do
@@ -894,6 +905,7 @@ RedmineApp::Application.routes.draw do
get 'member_score', :to => 'courses#member_score'
post 'finishcourse'
post 'restartcourse'
+ match "renew", :to => 'courses#renew', :via => [:post, :get], :as =>'renew'
match "searchmembers", :controller => 'courses', :action => 'searchmembers', :via => [:post,:get]
match "searchgroupmembers", :via => [:post, :get]
match 'member_score_sort', :via => [:get]
diff --git a/db/migrate/20151208015409_add_is_delete_to_courses.rb b/db/migrate/20151208015409_add_is_delete_to_courses.rb
new file mode 100644
index 000000000..cf037e010
--- /dev/null
+++ b/db/migrate/20151208015409_add_is_delete_to_courses.rb
@@ -0,0 +1,5 @@
+class AddIsDeleteToCourses < ActiveRecord::Migration
+ def change
+ add_column :courses, :is_delete, :integer, :default => 0
+ end
+end
diff --git a/db/migrate/20151208073241_add_subfield_to_document.rb b/db/migrate/20151208073241_add_subfield_to_document.rb
new file mode 100644
index 000000000..b070a9cec
--- /dev/null
+++ b/db/migrate/20151208073241_add_subfield_to_document.rb
@@ -0,0 +1,5 @@
+class AddSubfieldToDocument < ActiveRecord::Migration
+ def change
+ add_column :org_document_comments, :org_subfield_id, :integer
+ end
+end
diff --git a/db/migrate/20151209085900_add_type_to_org_subfields.rb b/db/migrate/20151209085900_add_type_to_org_subfields.rb
new file mode 100644
index 000000000..3616a1eb4
--- /dev/null
+++ b/db/migrate/20151209085900_add_type_to_org_subfields.rb
@@ -0,0 +1,5 @@
+class AddTypeToOrgSubfields < ActiveRecord::Migration
+ def change
+ add_column :org_subfields, :field_type, :string
+ end
+end
diff --git a/db/migrate/20151209085942_set_type_for_org_subfields.rb b/db/migrate/20151209085942_set_type_for_org_subfields.rb
new file mode 100644
index 000000000..0ce313234
--- /dev/null
+++ b/db/migrate/20151209085942_set_type_for_org_subfields.rb
@@ -0,0 +1,10 @@
+class SetTypeForOrgSubfields < ActiveRecord::Migration
+ def up
+ OrgSubfield.all.each do |field|
+ field.update_attribute(:field_type, "Post")
+ end
+ end
+
+ def down
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 4aeed2409..17e613acb 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 => 20151208032013) do
+ActiveRecord::Schema.define(:version => 20151209085942) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@@ -459,6 +459,7 @@ ActiveRecord::Schema.define(:version => 20151208032013) do
t.integer "open_student", :default => 0
t.integer "outline", :default => 0
t.integer "publish_resource", :default => 0
+ t.integer "is_delete", :default => 0
end
create_table "custom_fields", :force => true do |t|
@@ -1160,6 +1161,7 @@ ActiveRecord::Schema.define(:version => 20151208032013) do
t.datetime "updated_at", :null => false
t.boolean "locked", :default => false
t.integer "sticky", :default => 0
+ t.integer "org_subfield_id"
end
create_table "org_member_roles", :force => true do |t|
@@ -1186,6 +1188,7 @@ ActiveRecord::Schema.define(:version => 20151208032013) do
t.string "name"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
+ t.string "field_type"
end
create_table "organizations", :force => true do |t|
diff --git a/lib/tasks/sync_check_members.rake b/lib/tasks/sync_check_members.rake
new file mode 100644
index 000000000..8c942c88c
--- /dev/null
+++ b/lib/tasks/sync_check_members.rake
@@ -0,0 +1,25 @@
+require 'trustie/gitlab/sync'
+
+namespace :gitlab do
+ namespace :check_members do
+ desc "check up projects' members "
+ task :projects => :environment do
+ s = Trustie::Gitlab::Sync.new
+ g = Gitlab.client
+ Project.all.each do |project|
+ unless project.gpid.nil?
+ begin
+ gmembers = g.team_members(project.gpid)
+ if gmembers.count != project.members.count
+ puts "gitlab' projects count #{gmembers.count}"
+ puts "project ID is #{project.id}"
+ s.only_members(project)
+ end
+ rescue
+ p "This project is wrong #{project.id}"
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/lib/tasks/sync_gitlab_user.rake b/lib/tasks/sync_gitlab_user.rake
index fb84f5f08..9259353c0 100644
--- a/lib/tasks/sync_gitlab_user.rake
+++ b/lib/tasks/sync_gitlab_user.rake
@@ -6,32 +6,55 @@ namespace :gitlab do
users = User.find_by_sql("select * from users where gid is null")
s = Trustie::Gitlab::Sync.new
g = Gitlab.client
- logger = Logger.new('./log/add_gid.log', 'daily') #按天生成
+ logger_i = Logger.new('./log/task_add_gid.log', 'daily')
+ logger_e = Logger.new('./log/task_add_gid_error.log', 'daily')
+ NAMESPACE_REGEX_STR = '(?:[a-zA-Z0-9_\.][a-zA-Z0-9_\-\.]*[a-zA-Z0-9_\-]|[a-zA-Z0-9_])'.freeze
+ MAIL_REGEX_STR ='^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$'.freeze
+ error_cnt=0
+ success_cnt=0
+ p "同步Gitlab用户开始..."
users.each do |user|
+ info="userid=#{user.id},mail=#{user.mail},login(username)=#{user.login},name=#{user.show_name}"
+ # username不能有特殊字符,不能有保留字符,邮箱特殊字符(比如‘>’)导致search失败的，name不能为空串
+ if !(user.login =~ /\A#{NAMESPACE_REGEX_STR}\Z/.freeze)
+ logger_e.error("#{info}，error=校验失败：username特殊字符")
+ error_cnt+=1
+ next
+ elsif !(user.mail.downcase =~ /#{MAIL_REGEX_STR}/)
+ logger_e.error("#{info}，error=校验失败：邮箱特殊字符")
+ error_cnt+=1
+ next
+ elsif user.show_name.lstrip.rstrip.blank?
+ logger_e.error("#{info}，error=校验失败：name不正常")
+ error_cnt+=1
+ next
+ end
begin
us = g.get("/users?search=#{user.mail}")
- puts user.mail
if us.blank?
- puts "55555555555555555"
s.sync_user(user)
+ logger_i.info("sync_remote_user:id=#{user.id},mail=#{user.mail}")
+ success_cnt+=1
else
- # 解决查询的时候出现多值的情况，比如:123@163.com和g123@163.com
- puts "66666666666666666666"
- puts user.id
if Array === us
us.each do |u|
if u.email == user.mail
user.gid = u.id
- user.save
+ # !爆炸方法抛出异常
+ user.save!
+ logger_i.info("sync_local_user:#{info}")
+ success_cnt+=1
end
end
end
end
rescue => e
- logger.error("userid=#{user.id},mail=#{user.mail},login=#{user.login},error=#{e}")
+ logger_e.error("#{info},error=#{e}")
puts e
end
end
+ p "同步Gitlab用户结束..."
+ p "同步成功#{success_cnt}，未完成#{error_cnt}"
end
task :sync_members => :environment do
diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index a6506bbf3..bf9cb26d8 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -4186,6 +4186,7 @@ _extend(KUploadButton, {
(options.form ? '
<%=link_to "删除该课程", course_path(@course), :method => :delete, :confirm=>"确认要删除该课程吗？" %>
+ （友情提示：删除该课程后如果您想恢复该课程，请联系系统管理员！）
+