激活邮箱界面显示邮箱,激活邮箱界面留言太长不能留言解决

This commit is contained in:
yuanke 2016-07-01 15:49:25 +08:00
parent a8bd91754d
commit 8db5852a61
4 changed files with 26 additions and 19 deletions

View File

@ -239,17 +239,18 @@ class AccountController < ApplicationController
end
def resendmail
status = 1
result = {:status=>1, :email=>""}
user = User.find(params[:user]) if params[:user]
result[:email] = user.mail
token = Token.new(:user => user, :action => "register")
if token.save
# Mailer.run.register(token)
Mailer.register(token).deliver
else
yield if block_given?
status = 0
result[:status] = 0
end
render :json => status
render :json => result
end
def email_activation

View File

@ -23,9 +23,15 @@
url,
{user: id },
function (data) {
console.log("1111111111");
console.log(data);
$(".email_verify_btn").replaceWith("<p class='email_verify_p mt30 ml30'>激活邮件已发送至您的注册邮箱,请及时登录邮箱进行验证。</p>");
//邮箱@之前用a**b格式显示
var mail = data.email;
var pos = mail.indexOf("@");
var restr = mail.substring(1,pos-1);
if( mail.split("@")[0].length > 2 ){
mail = mail.replace(restr,"***");
}
$(".email_verify_btn").replaceWith("<p class='email_verify_p mt30 ml30'>激活邮件已发送至您的注册邮箱("+mail+"),请及时登录邮箱进行验证。</p>");
}
);
}
@ -37,16 +43,16 @@
pop_up_box(htmlvalue,580,30,50);
return;
}
$.get(
url,
{user:user,text:$(".email_prompt_mes").val() },
function (data) {
console.log("2222222");
console.log(data);
var htmlvalue = "<div class='email_tancon'><h2 class='email_tan_title'>您的留言已发送</h2><p class='email_tan_p'>我们将尽快处理好,并通过邮件通知您。感谢您的反馈!</p></div>"
pop_up_box(htmlvalue,580,30,50);
$(".email_prompt_mes").val("");
}
);
$.ajax({
url: url,
data: {user: user, text: $(".email_prompt_mes").val() },
type: "POST",
success: function (data) {
var htmlvalue = "<div class='email_tancon'><h2 class='email_tan_title'>您的留言已发送</h2><p class='email_tan_p'>我们将尽快处理好,并通过邮件通知您。感谢您的反馈!</p></div>"
pop_up_box(htmlvalue, 580, 30, 45);
$(".email_prompt_mes").val("");
}
});
}
</script>

View File

@ -48,7 +48,7 @@
var last_name = $.trim($('#last_name').val());
if(last_name.length > 30)
{
$("#valid_email").text("用户姓过长,最长为30个字符");
$("#valid_email").text("用户姓过长,最长为30个字符");
return false;
}
else

View File

@ -496,7 +496,7 @@ RedmineApp::Application.routes.draw do
match 'projects/:id/wiki/destroy', :to => 'wikis#destroy', :via => [:get, :post]
#激活邮箱反馈问题
match 'users/:id/leave_email_activation_message', :to => 'words#leave_email_activation_message', :via => :get, :as => "leave_email_activation_message"
match 'users/:id/leave_email_activation_message', :to => 'words#leave_email_activation_message', :via => :post, :as => "leave_email_activation_message"
# boards
match 'boards/:board_id/topics/new', :to => 'messages#new', :via => [:get, :post], :as => 'new_board_message'