Added optional editor login support back in

cykod · Mar 2, 2010 · 39d3fe5 · 39d3fe5
1 parent 01a412b
commit 39d3fe5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/app/models/end_user.rb b/app/models/end_user.rb
@@ -118,6 +118,10 @@ class EndUser < DomainModel
                          [ 'Import', 'import' ],
                          [ 'Referrel', 'referrel' ] ]
 
+  if CMS_EDITOR_LOGIN_SUPPORT 
+   after_save :update_editor_login
+  end
+
   def after_create #:nodoc:
     if @tag_cache
       self.tag(@tag_cache)
@@ -127,7 +131,6 @@ def after_create #:nodoc:
   ## Validation Fucntions 
 
 
-
   def before_validation #:nodoc:
     self.email = self.email.downcase unless self.email.blank?
   end
@@ -474,9 +477,10 @@ def before_save #:nodoc:
   end
 
   def update_editor_login #:nodoc:
-    if self.editor?
+    if self.registered? && self.activated? && self.editor?
       editor_login= EditorLogin.find_by_domain_id_and_email(Configuration.domain_id,self.email) || EditorLogin.new
       editor_login.update_attributes(:domain_id => Configuration.domain_id,
+                                     :login_hash => self.class.generate_hash,
                                      :email => self.email,
                                      :end_user_id => self.id,
                                      :hashed_password => self.hashed_password)

diff --git a/config/environment.rb b/config/environment.rb
@@ -32,6 +32,8 @@
   CMS_DEFAULT_DOMAIN = defaults_config_file['domain']
 
   CMS_SYSTEM_ADMIN_EMAIL = defaults_config_file['system_admin']
+
+   CMS_EDITOR_LOGIN_SUPPORT = defaults_config_file['editor_login'] || false
 
   DEFAULT_DATETIME_FORMAT = defaults_config_file['default_datetime_format'] || "%m/%d/%Y %I:%M %p"
   DEFAULT_DATE_FORMAT = defaults_config_file['default_date_format'] || "%m/%d/%Y"