jro_apps/redmine Commit - r1780:1bb237c3e004

r17044@gaspard (orig r915): jplang | 2007-11-18 18:46:55 +0100...

Nicolas Chuche -

r1780:1bb237c3e004

parent child

Context file:

r1780:1bb237c3e004

Expand all files

app/views/mailer/account_activation_request.text.html.rhtml created 644 +2 0

@@ -0,0 +1,2
	1	<p><%= l(:mail_body_account_activation_request, @user.login) %></p>
	2	<p><%= link_to @url, @url %></p>

app/views/mailer/account_activation_request.text.plain.rhtml created 644 +2 0

@@ -0,0 +1,2
	1	<%= l(:mail_body_account_activation_request, @user.login) %>
	2	<%= @url %>

app/controllers/account_controller.rb +45 -23

@@ -21,7 +21,7 class AccountController < ApplicationController
21	include CustomFieldsHelper	21	include CustomFieldsHelper
22		22
23	# prevents login action to be filtered by check_if_login_required application scope filter	23	# prevents login action to be filtered by check_if_login_required application scope filter
24	skip_before_filter :check_if_login_required, :only => [:login, :lost_password, :register]	24	skip_before_filter :check_if_login_required, :only => [:login, :lost_password, :register, :activate]
25		25
26	# Show user's account	26	# Show user's account
27	def show	27	def show
@@ -106,40 +106,62 class AccountController < ApplicationController
106	# User self-registration	106	# User self-registration
107	def register	107	def register
108	redirect_to(home_url) && return unless Setting.self_registration?	108	redirect_to(home_url) && return unless Setting.self_registration?
109	if params[:token]	109	if request.get?
110	token = Token.find_by_action_and_value("register", params[:token])	110	@user = User.new(:language => Setting.default_language)
111	redirect_to(home_url) && return unless token and !token.expired?	111	@custom_values = UserCustomField.find(:all).collect { \|x\| CustomValue.new(:custom_field => x, :customized => @user) }
112	user = token.user
113	redirect_to(home_url) && return unless user.status == User::STATUS_REGISTERED
114	user.status = User::STATUS_ACTIVE
115	if user.save
116	token.destroy
117	flash[:notice] = l(:notice_account_activated)
118	redirect_to :action => 'login'
119	return
120	end
121	else	112	else
122	if request.get?	113	@user = User.new(params[:user])
123	@user = User.new(:language => Setting.default_language)	114	@user.admin = false
124	@custom_values = UserCustomField.find(:all).collect { \|x\| CustomValue.new(:custom_field => x, :customized => @user) }	115	@user.login = params[:user][:login]
125	else	116	@user.status = User::STATUS_REGISTERED
126	@user = User.new(params[:user])	117	@user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
127	@user.admin = false	118	if params["custom_fields"]
128	@user.login = params[:user][:login]
129	@user.status = User::STATUS_REGISTERED
130	@user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
131	@custom_values = UserCustomField.find(:all).collect { \|x\| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }	119	@custom_values = UserCustomField.find(:all).collect { \|x\| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
132	@user.custom_values = @custom_values	120	@user.custom_values = @custom_values
		121	end
		122	case Setting.self_registration
		123	when '1'
		124	# Email activation
133	token = Token.new(:user => @user, :action => "register")	125	token = Token.new(:user => @user, :action => "register")
134	if @user.save and token.save	126	if @user.save and token.save
135	Mailer.deliver_register(token)	127	Mailer.deliver_register(token)
136	flash[:notice] = l(:notice_account_register_done)	128	flash[:notice] = l(:notice_account_register_done)
137	redirect_to ~~:controller~~ => ~~'account'~~, :action => 'login'	129	redirect_to :action => 'login'
		130	end
		131	when '3'
		132	# Automatic activation
		133	@user.status = User::STATUS_ACTIVE
		134	if @user.save
		135	flash[:notice] = l(:notice_account_activated)
		136	redirect_to :action => 'login'
		137	end
		138	else
		139	# Manual activation by the administrator
		140	if @user.save
		141	# Sends an email to the administrators
		142	Mailer.deliver_account_activation_request(@user)
		143	flash[:notice] = l(:notice_account_pending)
		144	redirect_to :action => 'login'
138	end	145	end
139	end	146	end
140	end	147	end
141	end	148	end
142		149
		150	# Token based account activation
		151	def activate
		152	redirect_to(home_url) && return unless Setting.self_registration? && params[:token]
		153	token = Token.find_by_action_and_value('register', params[:token])
		154	redirect_to(home_url) && return unless token and !token.expired?
		155	user = token.user
		156	redirect_to(home_url) && return unless user.status == User::STATUS_REGISTERED
		157	user.status = User::STATUS_ACTIVE
		158	if user.save
		159	token.destroy
		160	flash[:notice] = l(:notice_account_activated)
		161	end
		162	redirect_to :action => 'login'
		163	end
		164
143	private	165	private
144	def logged_user=(user)	166	def logged_user=(user)
145	if user && user.is_a?(User)	167	if user && user.is_a?(User)

app/models/mailer.rb +9 -1

                      :password => password,
                      :login_url => url_for(:controller => 'account', :action => 'login')
               end
+              def account_activation_request(user)
+                # Send the email to all active administrators
+                recipients User.find_active(:all, :conditions => {:admin => true}).collect { |u| u.mail }.compact
+                subject l(:mail_subject_account_activation_request)
+                body :user => user,
+                     :url => url_for(:controller => 'users', :action => 'index', :status => User::STATUS_REGISTERED, :sort_key => 'created_on', :sort_order => 'desc')
+              end
               def lost_password(token)
                 set_language_if_valid(token.user.language)
                 recipients token.user.mail
                 subject l(:mail_subject_register)
                 body :token => token,
-                     :url => url_for(:controller => 'account', :action => 'register', :token => token.value)
+                     :url => url_for(:controller => 'account', :action => 'activate', :token => token.value)
               end
               def test(user)

app/views/account/register.rhtml 0 -3

             <% for @custom_value in @custom_values %>
             	<p><%= custom_field_tag_with_label @custom_value %></p>
             <% end %>
-            <p><label for="user_mail_notification"><%=l(:field_mail_notification)%></label>
-            <%= check_box 'user', 'mail_notification' %></p>
             <!--[eoform:user]-->
             </div>

app/views/settings/edit.rhtml +6 -1

             <%= select_tag 'settings[autologin]', options_for_select( [[l(:label_disabled), "0"]] + [1, 7, 30, 365].collect{|days| [lwr(:actionview_datehelper_time_in_words_day, days), days.to_s]}, Setting.autologin) %></p>
             <p><label><%= l(:setting_self_registration) %></label>
-            <%= check_box_tag 'settings[self_registration]', 1, Setting.self_registration? %><%= hidden_field_tag 'settings[self_registration]', 0 %></p>
+            <%= select_tag 'settings[self_registration]',
+                  options_for_select( [[l(:label_disabled), "0"],
+                                       [l(:label_registration_activation_by_email), "1"],
+                                       [l(:label_registration_manual_activation), "2"],
+                                       [l(:label_registration_automatic_activation), "3"]
+                                      ], Setting.self_registration ) %></p>
             <p><label><%= l(:label_password_lost) %></label>
             <%= check_box_tag 'settings[lost_password]', 1, Setting.lost_password? %><%= hidden_field_tag 'settings[lost_password]', 0 %></p>

config/settings.yml +1 -1

             login_required:
               default: 0
             self_registration:
-              default: 1
+              default: '2'
             lost_password:
               default: 1
             attachment_max_size:

lang/bg.yml +6 0

@@ -538,3 +538,9 mail_body_account_information: Your Redmine account information
538	setting_protocol: Protocol	538	setting_protocol: Protocol
539	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"	539	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
540	setting_time_format: Time format	540	setting_time_format: Time format
		541	label_registration_activation_by_email: account activation by email
		542	mail_subject_account_activation_request: Redmine account activation request
		543	mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
		544	label_registration_automatic_activation: automatic account activation
		545	label_registration_manual_activation: manual account activation
		546	notice_account_pending: "Your account was created and is now pending administrator approval."

lang/cs.yml +6 0

@@ -538,3 +538,9 mail_body_account_information: Your Redmine account information
538	setting_protocol: Protocol	538	setting_protocol: Protocol
539	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"	539	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
540	setting_time_format: Time format	540	setting_time_format: Time format
		541	label_registration_activation_by_email: account activation by email
		542	mail_subject_account_activation_request: Redmine account activation request
		543	mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
		544	label_registration_automatic_activation: automatic account activation
		545	label_registration_manual_activation: manual account activation
		546	notice_account_pending: "Your account was created and is now pending administrator approval."

lang/de.yml +6 0

@@ -538,3 +538,9 mail_body_account_information: Your Redmine account information
538	setting_protocol: Protocol	538	setting_protocol: Protocol
539	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"	539	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
540	setting_time_format: Time format	540	setting_time_format: Time format
		541	label_registration_activation_by_email: account activation by email
		542	mail_subject_account_activation_request: Redmine account activation request
		543	mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
		544	label_registration_automatic_activation: automatic account activation
		545	label_registration_manual_activation: manual account activation
		546	notice_account_pending: "Your account was created and is now pending administrator approval."

lang/en.yml +8 -2

             notice_feeds_access_key_reseted: Your RSS access key was reseted.
             notice_failed_to_save_issues: "Failed to save %d issue(s) on %d selected: %s."
             notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit."
+            notice_account_pending: "Your account was created and is now pending administrator approval."
             mail_subject_lost_password: Your Redmine password
             mail_body_lost_password: 'To change your Redmine password, click on the following link:'
             mail_body_register: 'To activate your Redmine account, click on the following link:'
             mail_body_account_information_external: You can use your "%s" account to log into Redmine.
             mail_body_account_information: Your Redmine account information
+            mail_subject_account_activation_request: Redmine account activation request
+            mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
             gui_validation_error: 1 error
             gui_validation_error_plural: %d errors
             setting_app_subtitle: Application subtitle
             setting_welcome_text: Welcome text
             setting_default_language: Default language
-            setting_login_required: Authent. required
+            setting_login_required: Authentication required
-            setting_self_registration: Self-registration enabled
+            setting_self_registration: Self-registration
             setting_attachment_max_size: Attachment max. size
             setting_issues_export_limit: Issues export limit
             setting_mail_from: Emission email address
             label_user_mail_option_selected: "For any event on the selected projects only..."
             label_user_mail_option_none: "Only for things I watch or I'm involved in"
             label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
+            label_registration_activation_by_email: account activation by email
+            label_registration_manual_activation: manual account activation
+            label_registration_automatic_activation: automatic account activation
             button_login: Login
             button_submit: Submit

lang/es.yml +6 0

@@ -541,3 +541,9 mail_body_account_information: Your Redmine account information
541	setting_protocol: Protocol	541	setting_protocol: Protocol
542	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"	542	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
543	setting_time_format: Time format	543	setting_time_format: Time format
		544	label_registration_activation_by_email: account activation by email
		545	mail_subject_account_activation_request: Redmine account activation request
		546	mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
		547	label_registration_automatic_activation: automatic account activation
		548	label_registration_manual_activation: manual account activation
		549	notice_account_pending: "Your account was created and is now pending administrator approval."

lang/fr.yml +8 -2

             notice_feeds_access_key_reseted: Votre clé d'accès aux flux RSS a été réinitialisée.
             notice_failed_to_save_issues: "%d demande(s) sur les %d sélectionnées n'ont pas pu être mise(s) à jour: %s."
             notice_no_issue_selected: "Aucune demande sélectionnée ! Cochez les demandes que vous voulez mettre à jour."
+            notice_account_pending: "Votre compte a été créé et attend l'approbation de l'administrateur."
             mail_subject_lost_password: Votre mot de passe redMine
             mail_body_lost_password: 'Pour changer votre mot de passe Redmine, cliquez sur le lien suivant:'
             mail_body_register: 'Pour activer votre compte Redmine, cliquez sur le lien suivant:'
             mail_body_account_information_external: Vous pouvez utiliser votre compte "%s" pour vous connecter à Redmine.
             mail_body_account_information: Paramètres de connexion de votre compte Redmine
+            mail_subject_account_activation_request: "Demande d'activation d'un compte Redmine"
+            mail_body_account_activation_request: "Un nouvel utilisateur (%s) s'est inscrit. Son compte nécessite votre approbation:"
             gui_validation_error: 1 erreur
             gui_validation_error_plural: %d erreurs
             setting_app_subtitle: Sous-titre de l'application
             setting_welcome_text: Texte d'accueil
             setting_default_language: Langue par défaut
-            setting_login_required: Authentif. obligatoire
+            setting_login_required: Authentification obligatoire
-            setting_self_registration: Enregistrement autorisé
+            setting_self_registration: Inscription des nouveaux utilisateurs
             setting_attachment_max_size: Taille max des fichiers
             setting_issues_export_limit: Limite export demandes
             setting_mail_from: Adresse d'émission
             label_user_mail_option_selected: "Pour tous les événements des projets sélectionnés..."
             label_user_mail_option_none: "Seulement pour ce que je surveille ou à quoi je participe"
             label_user_mail_no_self_notified: "Je ne veux pas être notifié des changements que j'effectue"
+            label_registration_activation_by_email: activation du compte par email
+            label_registration_manual_activation: activation manuelle du compte
+            label_registration_automatic_activation: activation automatique du compte
             button_login: Connexion
             button_submit: Soumettre

lang/he.yml +6 0

@@ -538,3 +538,9 mail_body_account_information: Your Redmine account information
538	setting_protocol: Protocol	538	setting_protocol: Protocol
539	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"	539	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
540	setting_time_format: Time format	540	setting_time_format: Time format
		541	label_registration_activation_by_email: account activation by email
		542	mail_subject_account_activation_request: Redmine account activation request
		543	mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
		544	label_registration_automatic_activation: automatic account activation
		545	label_registration_manual_activation: manual account activation
		546	notice_account_pending: "Your account was created and is now pending administrator approval."

lang/it.yml +6 0

@@ -538,3 +538,9 mail_body_account_information: Your Redmine account information
538	setting_protocol: Protocol	538	setting_protocol: Protocol
539	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"	539	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
540	setting_time_format: Time format	540	setting_time_format: Time format
		541	label_registration_activation_by_email: account activation by email
		542	mail_subject_account_activation_request: Redmine account activation request
		543	mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
		544	label_registration_automatic_activation: automatic account activation
		545	label_registration_manual_activation: manual account activation
		546	notice_account_pending: "Your account was created and is now pending administrator approval."

lang/ja.yml +6 0

@@ -539,3 +539,9 mail_body_account_information: Your Redmine account information
539	setting_protocol: Protocol	539	setting_protocol: Protocol
540	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"	540	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
541	setting_time_format: Time format	541	setting_time_format: Time format
		542	label_registration_activation_by_email: account activation by email
		543	mail_subject_account_activation_request: Redmine account activation request
		544	mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
		545	label_registration_automatic_activation: automatic account activation
		546	label_registration_manual_activation: manual account activation
		547	notice_account_pending: "Your account was created and is now pending administrator approval."

lang/ko.yml +7 -1

             setting_welcome_text: Welcome text
             setting_default_language: Default language
             setting_login_required: Authent. required
-            setting_self_registration: Self-registration enabled
+            setting_self_registration: Self-registration
             setting_attachment_max_size: Attachment max. size
             setting_issues_export_limit: Issues export limit
             setting_mail_from: Emission mail address
             mail_body_account_information: Your Redmine account information
             label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
             setting_time_format: Time format
+            label_registration_activation_by_email: account activation by email
+            mail_subject_account_activation_request: Redmine account activation request
+            mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
+            label_registration_automatic_activation: automatic account activation
+            label_registration_manual_activation: manual account activation
+            notice_account_pending: "Your account was created and is now pending administrator approval."

lang/nl.yml +6 0

@@ -539,3 +539,9 mail_body_account_information: Your Redmine account information
539	setting_protocol: Protocol	539	setting_protocol: Protocol
540	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"	540	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
541	setting_time_format: Time format	541	setting_time_format: Time format
		542	label_registration_activation_by_email: account activation by email
		543	mail_subject_account_activation_request: Redmine account activation request
		544	mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
		545	label_registration_automatic_activation: automatic account activation
		546	label_registration_manual_activation: manual account activation
		547	notice_account_pending: "Your account was created and is now pending administrator approval."

lang/pl.yml +6 0

@@ -538,3 +538,9 mail_body_account_information: Twoje konto w Redmine
538	setting_protocol: Protocol	538	setting_protocol: Protocol
539	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"	539	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
540	setting_time_format: Time format	540	setting_time_format: Time format
		541	label_registration_activation_by_email: account activation by email
		542	mail_subject_account_activation_request: Redmine account activation request
		543	mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
		544	label_registration_automatic_activation: automatic account activation
		545	label_registration_manual_activation: manual account activation
		546	notice_account_pending: "Your account was created and is now pending administrator approval."

lang/pt-br.yml +6 0

@@ -538,3 +538,9 mail_body_account_information: Your Redmine account information
538	setting_protocol: Protocol	538	setting_protocol: Protocol
539	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"	539	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
540	setting_time_format: Time format	540	setting_time_format: Time format
		541	label_registration_activation_by_email: account activation by email
		542	mail_subject_account_activation_request: Redmine account activation request
		543	mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
		544	label_registration_automatic_activation: automatic account activation
		545	label_registration_manual_activation: manual account activation
		546	notice_account_pending: "Your account was created and is now pending administrator approval."

lang/pt.yml +6 0

@@ -538,3 +538,9 mail_body_account_information: Your Redmine account information
538	setting_protocol: Protocol	538	setting_protocol: Protocol
539	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"	539	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
540	setting_time_format: Time format	540	setting_time_format: Time format
		541	label_registration_activation_by_email: account activation by email
		542	mail_subject_account_activation_request: Redmine account activation request
		543	mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
		544	label_registration_automatic_activation: automatic account activation
		545	label_registration_manual_activation: manual account activation
		546	notice_account_pending: "Your account was created and is now pending administrator approval."

lang/ro.yml +6 0

@@ -538,3 +538,9 mail_body_account_information: Your Redmine account information
538	setting_protocol: Protocol	538	setting_protocol: Protocol
539	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"	539	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
540	setting_time_format: Time format	540	setting_time_format: Time format
		541	label_registration_activation_by_email: account activation by email
		542	mail_subject_account_activation_request: Redmine account activation request
		543	mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
		544	label_registration_automatic_activation: automatic account activation
		545	label_registration_manual_activation: manual account activation
		546	notice_account_pending: "Your account was created and is now pending administrator approval."

lang/ru.yml +6 0

@@ -538,3 +538,9 default_activity_development: Разработка
538	enumeration_issue_priorities: Приоритеты задач	538	enumeration_issue_priorities: Приоритеты задач
539	enumeration_doc_categories: Категории документов	539	enumeration_doc_categories: Категории документов
540	enumeration_activities: Действия (учет времени)	540	enumeration_activities: Действия (учет времени)
		541	label_registration_activation_by_email: account activation by email
		542	mail_subject_account_activation_request: Redmine account activation request
		543	mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
		544	label_registration_automatic_activation: automatic account activation
		545	label_registration_manual_activation: manual account activation
		546	notice_account_pending: "Your account was created and is now pending administrator approval."

lang/sr.yml +6 0

@@ -539,3 +539,9 button_copy: Copy
539	setting_protocol: Protocol	539	setting_protocol: Protocol
540	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"	540	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
541	setting_time_format: Time format	541	setting_time_format: Time format
		542	label_registration_activation_by_email: account activation by email
		543	mail_subject_account_activation_request: Redmine account activation request
		544	mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
		545	label_registration_automatic_activation: automatic account activation
		546	label_registration_manual_activation: manual account activation
		547	notice_account_pending: "Your account was created and is now pending administrator approval."

lang/sv.yml +6 0

@@ -539,3 +539,9 mail_body_account_information: Your Redmine account information
539	setting_protocol: Protocol	539	setting_protocol: Protocol
540	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"	540	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
541	setting_time_format: Time format	541	setting_time_format: Time format
		542	label_registration_activation_by_email: account activation by email
		543	mail_subject_account_activation_request: Redmine account activation request
		544	mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
		545	label_registration_automatic_activation: automatic account activation
		546	label_registration_manual_activation: manual account activation
		547	notice_account_pending: "Your account was created and is now pending administrator approval."

lang/zh.yml +6 0

@@ -541,3 +541,9 mail_body_account_information: Your Redmine account information
541	setting_protocol: Protocol	541	setting_protocol: Protocol
542	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"	542	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
543	setting_time_format: Time format	543	setting_time_format: Time format
		544	label_registration_activation_by_email: account activation by email
		545	mail_subject_account_activation_request: Redmine account activation request
		546	mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
		547	label_registration_automatic_activation: automatic account activation
		548	label_registration_manual_activation: manual account activation
		549	notice_account_pending: "Your account was created and is now pending administrator approval."

test/integration/account_test.rb +42 -1

@@ -56,5 +56,46 class AccountTest < ActionController::IntegrationTest
56		56
57	log_user('jsmith', 'newpass')	57	log_user('jsmith', 'newpass')
58	assert_equal 0, Token.count	58	assert_equal 0, Token.count
59	end	59	end
		60
		61	def test_register_with_automatic_activation
		62	Setting.self_registration = '3'
		63
		64	get 'account/register'
		65	assert_response :success
		66	assert_template 'account/register'
		67
		68	post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar"},
		69	:password => "newpass", :password_confirmation => "newpass"
		70	assert_redirected_to 'account/login'
		71	log_user('newuser', 'newpass')
		72	end
		73
		74	def test_register_with_manual_activation
		75	Setting.self_registration = '2'
		76
		77	post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar"},
		78	:password => "newpass", :password_confirmation => "newpass"
		79	assert_redirected_to 'account/login'
		80	assert !User.find_by_login('newuser').active?
		81	end
		82
		83	def test_register_with_email_activation
		84	Setting.self_registration = '1'
		85	Token.delete_all
		86
		87	post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar"},
		88	:password => "newpass", :password_confirmation => "newpass"
		89	assert_redirected_to 'account/login'
		90	assert !User.find_by_login('newuser').active?
		91
		92	token = Token.find(:first)
		93	assert_equal 'register', token.action
		94	assert_equal 'newuser@foo.bar', token.user.mail
		95	assert !token.expired?
		96
		97	get 'account/activate', :token => token.value
		98	assert_redirected_to 'account/login'
		99	log_user('newuser', 'newpass')
		100	end
60	end	101	end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages