diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index c05d1172c..c1b38fa39 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -140,6 +140,15 @@ class AccountController < ApplicationController @user.password, @user.password_confirmation = user_params[:password], user_params[:password_confirmation] end + if(@cache_identityy == "") + flash.now[:error]= l(:label_identity)+l(:'activerecord.errors.messages.empty') + return + end + if(@cache_city == "") + flash.now[:error]= l(:label_location)+l(:'activerecord.errors.messages.empty') + return + end + case Setting.self_registration when '1' register_by_email_activation(@user) diff --git a/app/models/repository.rb b/app/models/repository.rb index 57a818270..c2736dd30 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -42,7 +42,7 @@ class Repository < ActiveRecord::Base validates_uniqueness_of :identifier, :scope => :project_id, :allow_blank => true validates_exclusion_of :identifier, :in => %w(show entry raw changes annotate diff show stats graph) # donwcase letters, digits, dashes, underscores but not digits only - validates_format_of :identifier, :with => /^[a-zA-Z0-9_\-]+$/, :allow_blank => true + validates_format_of :identifier, :with => /^[a-z0-9_\-]+$/, :allow_blank => true # Checks if the SCM is enabled when creating a repository validate :repo_create_validation, :on => :create diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb index e44578243..b17283f3b 100644 --- a/app/views/issues/_attributes.html.erb +++ b/app/views/issues/_attributes.html.erb @@ -50,15 +50,18 @@ var _v= obj; if(_v==100) { - //alert(3); + //var select=$("select[id='issue_status_id']"); + $("select[id='issue_status_id']").find("option[value='3']").attr("selected","selected"); } else if(_v==0) { - //alert(1); + //alert(1); + $("select[id='issue_status_id']").find("option[value='1']").attr("selected","selected"); } else if(_v!=100&&_v!=0) { // alert(2); + $("select[id='issue_status_id']").find("option[value='2']").attr("selected","selected"); } }