diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index d0be72961..ba312c74a 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -99,7 +99,7 @@ class MembersController < ApplicationController @project.members << members # added by nie @project.project_infos << project_info - @project.user_grades << user_grades + @project.user_grades << user_grades unless user_grades.first.user_id.nil? # end end if members.present? && members.all? { |m| m.valid? } @@ -108,7 +108,11 @@ class MembersController < ApplicationController end end if params[:flag] - flash[:notice] = l(:label_invite_success) + unless members.present? && members.all? {|m| m.valid? } + flash[:error] = members.collect {|m| m.errors.full_messages}.flatten.uniq.join(', ') + else + flash[:notice] = l(:label_invite_success) + end respond_to do |format| format.html { redirect_to invite_members_project_url(@project) } end diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb index cd1e1f40f..2172af8de 100644 --- a/app/views/layouts/_base_feedback.html.erb +++ b/app/views/layouts/_base_feedback.html.erb @@ -7,10 +7,10 @@ #scrollsidebar a{ text-decoration:none;} html{ overflow-x:hidden;} - .scrollsidebar{ position:absolute;top:1px; right:1px; background:none; } + .scrollsidebar{ position:fixed;bottom:1px; right:1px; background:none; } .side_content{width:154px; height:auto; overflow:hidden; float:left; } .side_content .side_list {width:154px;overflow:hidden;} - .show_btn{ width:0; height:112px; overflow:hidden; float:left; cursor:pointer;} + .show_btn{ width:0; height:112px; overflow:hidden; float:left;margin-top: 200px; cursor:pointer;} .show_btn span { display:none;} .close_btn{width:24px;height:24px;cursor:pointer;} .side_title,.side_bottom,.close_btn,.show_btn {background:url(/images/sidebar_bg.png) no-repeat; } diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb index e8e77be8f..63f69e120 100644 --- a/app/views/projects/invite_members_by_mail.html.erb +++ b/app/views/projects/invite_members_by_mail.html.erb @@ -1,14 +1,28 @@