[Gemstracker-svn] SF.net SVN: gemstracker:[619] trunk

[<gem...@li...>]

Revision: 619
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=619&view=rev
Author:   matijsdejong
Date:     2012-04-16 11:38:07 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
Merged revision(s) 618 from tags/1.5.3-rc2:
New staff can login by default
Some extra comment for debugging
........

Modified Paths:
--------------
    trunk/library/classes/Gems/Default/StaffAction.php
    trunk/library/classes/Gems/User/UserLoader.php

Property Changed:
----------------
    trunk/
    trunk/library/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.5.0-pulse:306-430,467
/branches/1.5.x:426-455,458-472,475-481
/tags/1.5.0beta1:305
/tags/1.5.1:485,489,509-510
/tags/1.5.3-rc2:612,614,616
   + /branches/1.5.0-pulse:306-430,467
/branches/1.5.x:426-455,458-472,475-481
/tags/1.5.0beta1:305
/tags/1.5.1:485,489,509-510
/tags/1.5.3-rc2:612,614,616,618


Property changes on: trunk/library
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.5.0-pulse/library:306-344,346,467
/branches/1.5.x/library:426-455,458-472,475-481
/branches/newUser:113-150
/branches/newUser2:175-207
/branches/userloader:259-324
/tags/1.5.0beta1/library:305
/tags/1.5.1/library:485,489,509-510,534
/tags/1.5.3-rc2/library:612,614,616
   + /branches/1.5.0-pulse/library:306-344,346,467
/branches/1.5.x/library:426-455,458-472,475-481
/branches/newUser:113-150
/branches/newUser2:175-207
/branches/userloader:259-324
/tags/1.5.0beta1/library:305
/tags/1.5.1/library:485,489,509-510,534
/tags/1.5.3-rc2/library:612,614,616,618

Modified: trunk/library/classes/Gems/Default/StaffAction.php
===================================================================
--- trunk/library/classes/Gems/Default/StaffAction.php	2012-04-16 11:35:08 UTC (rev 618)
+++ trunk/library/classes/Gems/Default/StaffAction.php	2012-04-16 11:38:07 UTC (rev 619)
@@ -292,7 +292,7 @@
             $orgDef = $org->get('gor_user_class', $this->defaultStaffDefinition);
             $model->set('gul_user_class',       'default', $orgDef, 'multiOptions', $this->loader->getUserLoader()->getAvailableStaffDefinitions());
             $model->set('gsf_iso_lang',         'label', $this->_('Language'), 'multiOptions', $this->util->getLocalized()->getLanguages());
-            $model->set('gul_can_login',        'label', $this->_('Can login'), 'multiOptions', $this->util->getTranslated()->getYesNo());
+            $model->set('gul_can_login',        'label', $this->_('Can login'), 'multiOptions', $this->util->getTranslated()->getYesNo(), 'default', 1);
             $model->set('gsf_logout_on_survey', 'label', $this->_('Logout on survey'), 'multiOptions', $this->util->getTranslated()->getYesNo());
         }
 

Modified: trunk/library/classes/Gems/User/UserLoader.php
===================================================================
--- trunk/library/classes/Gems/User/UserLoader.php	2012-04-16 11:35:08 UTC (rev 618)
+++ trunk/library/classes/Gems/User/UserLoader.php	2012-04-16 11:38:07 UTC (rev 619)
@@ -503,7 +503,10 @@
 
         // Fail over for pre 1.5 projects
         //
-        // No login as other organization or with e-mail possible for first login
+        // No login as other organization or with e-mail possible for first login, before running of upgrade / patches
+        //
+        // Test code voor old user, code for password 'guest' is: 084e0343a0486ff05530df6c705c8bb4,
+        // for 'test4': 86985e105f79b95d6bc918fb45ec7727
         $sql = "SELECT gsf_id_user
             FROM gems__staff INNER JOIN
                     gems__organizations ON gsf_id_organization = gor_id_organization

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.