From 0484692b47f450e15c535565e3cadfaa010f6d17 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 22 Apr 2015 17:57:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E6=98=BE=E7=A4=BA=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=99=9A=E7=BA=BF=E5=A4=9A=E4=BD=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/users_service.rb | 1 - app/views/issues/_edit.html.erb | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/services/users_service.rb b/app/services/users_service.rb index 75dd316c0..3a92bf8f1 100644 --- a/app/services/users_service.rb +++ b/app/services/users_service.rb @@ -53,7 +53,6 @@ class UsersService @user.login = login @user.mail = mail password_confirmation = password - # 自动注册,跳过代码验证 should_confirmation_password = true if !password.blank? && !password_confirmation.blank? && should_confirmation_password @user.password, @user.password_confirmation = password, password_confirmation 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? %>