From 1e262ec73174967d533937bf3c783f245346be44 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 11 Mar 2015 15:32:50 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B5=84=E6=BA=90=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/files_controller.rb | 1 + app/views/files/_project_file.html.erb | 2 +- app/views/layouts/base_projects.html.erb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index aacb32990..42fd40606 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -99,6 +99,7 @@ class FilesController < ApplicationController end def index + @flag = params[:flag] || false #sort_init 'filename', 'asc' sort_init 'created_on', 'desc' sort_update 'created_on' => "#{Attachment.table_name}.created_on", diff --git a/app/views/files/_project_file.html.erb b/app/views/files/_project_file.html.erb index e204030f1..aa597f3f2 100644 --- a/app/views/files/_project_file.html.erb +++ b/app/views/files/_project_file.html.erb @@ -11,7 +11,7 @@ <%= link_to(l(:label_upload_files), 'javascript:void(0);', :class => 'icon m5p5 button_submit', :onclick => "$('#relation_file_div').slideUp();$('#upload_file_div').slideToggle('slow');") if User.current.allowed_to?(:manage_files, @project) %> <%= link_to(l(:label_relation_files), 'javascript:void(0);', :onclick => "$('#upload_file_div').slideUp();$('#relation_file_div').slideToggle();", :class => 'icon m5p5 button_submit') if User.current.allowed_to?(:manage_files, @project) %>

- + + + + + + <%= call_hook :view_layouts_base_body_bottom %> + + From 69eecf49d1b5d1866dcb11502f06687ca9065da0 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 12 Mar 2015 09:52:57 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_projects.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 10ff1538b..8c42298dd 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -158,7 +158,7 @@
<%= link_to l(:label_course_file), project_files_path(@project), :style => "color:#3CA5C6" %>(<%= @project.attachments.count %>) <% if User.current.member_of?(@project) %> - <%= link_to "+"+l(:label_upload_files), new_project_file_path(@project),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %> + <%= link_to "+"+l(:label_upload_files), project_files_path(@project,:flag => true),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %> <% end %>
<% end%> @@ -166,9 +166,9 @@
<%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %> (<%= @project.repositories.count %>) - <% if User.current.member_of?(@project) %> - <%= link_to "+"+l(:project_module_create_repository), new_project_repository_path(@project),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %> - <% end %> + <%# if User.current.member_of?(@project) %> + <%#= link_to "+"+l(:project_module_create_repository), new_project_repository_path(@project),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %> + <%# end %>
<% end %> From a05061af73829fa94edbb49283edb51d7f0642f9 Mon Sep 17 00:00:00 2001 From: z9hang Date: Thu, 12 Mar 2015 11:17:36 +0800 Subject: [PATCH 7/8] =?UTF-8?q?#1859=20=E8=AF=BE=E7=A8=8B--=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E5=BA=93=EF=BC=9A=E5=85=A8=E7=AB=99=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=AD=E2=80=9C=E9=80=89=E5=85=A5=E6=88=91=E7=9A=84=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E8=AF=BE=E7=A8=8B=E2=80=9D=E5=BC=B9=E5=87=BA=E7=9A=84?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8=E4=B8=AD=E5=8C=85=E6=8B=AC?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E8=AF=BE=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/files_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/files_helper.rb b/app/helpers/files_helper.rb index aace20e6c..9eff409ff 100644 --- a/app/helpers/files_helper.rb +++ b/app/helpers/files_helper.rb @@ -48,7 +48,7 @@ module FilesHelper def courses_check_box_tags(name,courses,current_course,attachment) s = '' courses.each do |course| - if !(attachment.container_type && attachment.container_id == course.id) && is_course_teacher(User.current,course) && course_in_current_or_next_term(course) + if !course_contains_attachment?(course,attachment) && is_course_teacher(User.current,course) && course_in_current_or_next_term(course) s << " [#{get_course_term course}]
" end end From 0ba7ef0560b13cded47926044d5ad02b90b3f4dd Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 12 Mar 2015 15:13:41 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E7=AE=B1?= =?UTF-8?q?=E9=82=80=E8=AF=B7=E6=97=B6=EF=BC=8C=E9=82=AE=E4=BB=B6=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E6=97=B6=E6=8F=90=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 3 +-- app/views/projects/invite_members_by_mail.html.erb | 11 ++++++++++- config/locales/zh.yml | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index f83580fba..4f84212b4 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -334,8 +334,7 @@ class ProjectsController < ApplicationController end def send_mail_to_member - - if !params[:mail].nil? && User.find_by_mail(params[:mail].to_s).nil? + if !params[:mail].blank? && User.find_by_mail(params[:mail].to_s).nil? email = params[:mail] Mailer.send_invite_in_project(email, @project, User.current).deliver @is_zhuce =false diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb index 70628094b..e0ba05f18 100644 --- a/app/views/projects/invite_members_by_mail.html.erb +++ b/app/views/projects/invite_members_by_mail.html.erb @@ -1,3 +1,12 @@ +

邀请加入

@@ -9,7 +18,7 @@

发送邮件邀请新用户

- 输入好友邮箱地址，Trustie帮您免费发送！ + 输入好友邮箱地址，Trustie会自动为该邮箱注册用户！

<%= render :partial => 'regested', locals: { :isregisted => false} %> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 76f14f0da..9ed58788d 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -181,7 +181,7 @@ zh: notice_successful_create: 创建成功 notice_successful_update: 更新成功 notice_successful_delete: 删除成功 - notice_registed_success: 该邮箱已被注册，请直接邀请注册用户 + notice_registed_success: 您输入的邮箱为空或者该邮箱已被注册! notice_failed_delete: 删除失败 notice_successful_connection: 连接成功 notice_successful_join: 加入成功