diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 5e67e0a2c..845f32dab 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -243,8 +243,10 @@ class ProjectsController < ApplicationController # Author lizanle # Description 项目动态展示方法，删除了不必要的代码 def show - - # 试图跳转到请求的按钮 + # params[:login]为邮箱邀请用户加入，主要功能： + # 1、自动注册 + # 2、加入项目、创建角色 + # 3、用户得分 if params[:login] login = params[:login] login = login.sub(/%40/,'@') @@ -252,6 +254,7 @@ class ProjectsController < ApplicationController password = params[:password] us = UsersService.new user = us.register_auto(login,mail, password) + Member.create(:role_ids => [4], :user_id => user.id,:project_id => @project.id) UserGrade.create(:user_id => user.id, :project_id => @project.id) User.current = user unless User.current.nil? diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 20175dc57..484a3189c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -633,7 +633,7 @@ module ApplicationHelper def principals_check_box_tags_li(name, principals) s = '' principals.each do |principal| - s << "
  • #{ check_box_tag name, principal.id, false, :id => nil } #{h link_to principal.userInfo, user_path( principal.id), :class => "c_blue" }
    • \n" + s << "
  • #{ check_box_tag name, principal.id, false, :id => nil } #{h link_to principal.userInfo, user_path( principal.id) }
    • \n" end s.html_safe end diff --git a/app/models/mailer.rb b/app/models/mailer.rb index ce3924119..acc268275 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -53,7 +53,8 @@ class Mailer < ActionMailer::Base @subject = "#{invitor.name} #{l(:label_invite_project)} #{project.name} " @password = newpass(6) @project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id, - :password => @password, :login => email) + :password => @password, + :login => email) mail :to => email, :subject => @subject end diff --git a/app/services/users_service.rb b/app/services/users_service.rb index c1f716fd1..3a92bf8f1 100644 --- a/app/services/users_service.rb +++ b/app/services/users_service.rb @@ -44,12 +44,14 @@ class UsersService #location = get_user_location @user #{:id => @user.id, :img_url => img_url, :nickname => @user.login, :gender => gender, :work_unit => work_unit, :mail => @user.mail, :location => location, :brief_introduction => @user.user_extensions.brief_introduction} end + + # 自动注册功能 FOR：邮件邀请 def register_auto(login,mail,password) @user = User.new @user.admin = false @user.register @user.login = login - @user.mail =mail + @user.mail = mail password_confirmation = password should_confirmation_password = true if !password.blank? && !password_confirmation.blank? && should_confirmation_password @@ -59,9 +61,7 @@ class UsersService else @user.password = "" end - @user = automatically_register(@user) - if @user.id != nil ue = @user.user_extensions ||= UserExtensions.new ue.user_id = @user.id @@ -69,6 +69,7 @@ class UsersService end @user end + #显示用户 #id用户id def show_user(params) diff --git a/app/views/attachments/_project_file_links.html.erb b/app/views/attachments/_project_file_links.html.erb index 9a65556d8..0135ee239 100644 --- a/app/views/attachments/_project_file_links.html.erb +++ b/app/views/attachments/_project_file_links.html.erb @@ -64,7 +64,7 @@ <% images = attachments.select(&:thumbnailable?) %> <% if images.any? %> <% images.each do |attachment| %> -
    <%= thumbnail_issue_tag(attachment) %>
    +
    <%= thumbnail_issue_tag(attachment) %>
    <% end %> <% end %> <% end %> diff --git a/app/views/avatar/_avatar_form.html.erb b/app/views/avatar/_avatar_form.html.erb index fef9f7bdb..f5ecfeadd 100644 --- a/app/views/avatar/_avatar_form.html.erb +++ b/app/views/avatar/_avatar_form.html.erb @@ -47,7 +47,6 @@ <%= l(:button_upload_photo) %> - (个人头像建议90*90大小，课程和项目logo建议60*60大小，或者等比图像) <%= file_field_tag 'avatar[image]', @@ -69,6 +68,8 @@ :source_id => source.id.to_s } %> +(个人头像建议90*90大小，或者等比图像) + <% content_for :header_tags do %> <%= javascript_include_tag 'avatars' %> diff --git a/app/views/avatar/_new_avatar_form.html.erb b/app/views/avatar/_new_avatar_form.html.erb index 8b81ebf66..c94f9f87a 100644 --- a/app/views/avatar/_new_avatar_form.html.erb +++ b/app/views/avatar/_new_avatar_form.html.erb @@ -3,10 +3,9 @@ <%#= link_to l(:button_delete_file),{:controller => :avatar,:action => :delete_image,:remote=>true,:source_type=> source.class,:source_id=>source.id},:confirm => l(:text_are_you_sure), :method => :post, :class => "upbtn fl" %> <%= l(:button_upload_photo) %> -(个人头像建议90*90大小，课程和项目logo建议60*60大小，或者等比图像) <%= file_field_tag 'avatar[image]', :id => nil, - :class => 'upload_file ', + :class => 'upload_avatar ', :size => "1", :multiple => false, :onchange => 'addInputAvatar(this);', @@ -22,6 +21,7 @@ :source_id => source.id.to_s } %> +(课程和项目logo建议60*60大小，或者等比图像) <% content_for :header_tags do %> <%= javascript_include_tag 'avatars' %> <% end %> diff --git a/app/views/contests/_form_contest.html.erb b/app/views/contests/_form_contest.html.erb index ec993fae8..344d69571 100644 --- a/app/views/contests/_form_contest.html.erb +++ b/app/views/contests/_form_contest.html.erb @@ -67,7 +67,7 @@ <%= f.text_field :deadline, :required => true, :size => 60, - :style => "width:150px;", + :style => "width:150px;float:left;", :readonly => true, :placeholder => "#{l(:label_deadline)}" %> diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb index 1266f4611..e4c1290aa 100644 --- a/app/views/issues/_edit.html.erb +++ b/app/views/issues/_edit.html.erb @@ -5,12 +5,14 @@ <% if @edit_allowed || !@allowed_statuses.empty? %> + <% end %> -
    + <% if @journals.present? %> diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 8890e88a4..096dadf8b 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -228,9 +228,9 @@

    请选择项目类型：

    确定 diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb index faccfbeeb..0aa558014 100644 --- a/app/views/projects/settings/_new_members.html.erb +++ b/app/views/projects/settings/_new_members.html.erb @@ -12,19 +12,19 @@
    <% if members.any? %>