diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 4b5a8c064..2c4929019 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -136,7 +136,7 @@ class AccountController < ApplicationController
session[:auth_source_registration] = nil
self.logged_user = @user
flash[:notice] = l(:notice_account_activated)
- render :action => 'email_valid'
+ redirect_to my_account_path
end
else
@user.login = params[:user][:login]
diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb
index a18c15068..32940d111 100644
--- a/app/views/account/register.html.erb
+++ b/app/views/account/register.html.erb
@@ -17,10 +17,10 @@
<% if @user.auth_source_id.nil? %>
- <%= link_to_user member.principal %> |
-
+ | <%= link_to_user member.principal %> |
+
<%= h member.roles.sort.collect(&:to_s).join(', ') %>
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 4ffcc63fc..04793a02e 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -9,6 +9,47 @@
function () {
$("#province").attr("href", "#WOpenWindow")
$("#province").leanModal({top: 100, closeButton: ".modal_close"});
+ var $lastname = $('#user_lastname')
+ var $firstname = $('#user_firstname')
+ var $enterprise = $('#enterprise_name')
+ $lastname.blur(function () {
+ var pas1 = document.getElementById("user_lastname").value;
+
+ if (pas1 == "") {
+ $('#valid_lastname').html('' + "<%= l(:lastname_empty) %>"+ "");
+ $('#lastname_limit').hide();
+ }
+ else {
+ $('#valid_lastname').html('' + "");
+ $('#lastname_limit').show();
+ }
+
+ });
+ $firstname.blur(function () {
+ var pas1 = document.getElementById("user_firstname").value;
+
+ if (pas1 == "") {
+ $('#valid_firstname').html('' + "<%= l(:firstname_empty) %>"+ "");
+ $('#firstname_limit').hide();
+ }
+ else {
+ $('#valid_firstname').html('' + "");
+ $('#firstname_limit').show();
+ }
+ });
+ $enterprise.blur(function () {
+ var pas1 = document.getElementById("enterprise_name").value;
+
+ if (pas1 == "") {
+ $('#valid_companyname').html('' + "<%= l(:enterprise_empty) %>"+ "");
+
+ }
+ else {
+ $('#valid_lastname').html('' + "");
+
+ }
+
+ });
}
);
@@ -61,16 +102,19 @@
<%= l(:label_information_plural) %>
+
+
- <%= f.text_field :login, :required => true, :size => 25, :name => "login"%>
+ <%= f.text_field :login, :required => true, :size => 25, :name => "login", :readonly => true %>
<%= l(:label_max_number) %>
-
- <%= l(:label_identity) %> *
- |