[Gemstracker-svn] SF.net SVN: gemstracker:[149] branches/newUser

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

Revision: 149
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=149&view=rev
Author:   matijsdejong
Date:     2011-10-27 15:49:44 +0000 (Thu, 27 Oct 2011)
Log Message:
-----------
Some final fixes for creating staff users and deleting items

Modified Paths:
--------------
    branches/newUser/classes/Gems/Default/StaffAction.php
    branches/newUser/classes/MUtil/Model/JoinModel.php
    branches/newUser/configs/db/patches.sql

Modified: branches/newUser/classes/Gems/Default/StaffAction.php
===================================================================
--- branches/newUser/classes/Gems/Default/StaffAction.php	2011-10-27 15:37:58 UTC (rev 148)
+++ branches/newUser/classes/Gems/Default/StaffAction.php	2011-10-27 15:49:44 UTC (rev 149)
@@ -105,6 +105,7 @@
 
         $bridge->addHidden(  'gsu_id_user');
         $bridge->addHidden(  'gsf_id_user'); // Needed for e-mail validation
+        $bridge->addHidden(  'gsu_user_class');
         $bridge->addText(    'gsu_login', 'size', 15, 'minlength', 4,
             'validator', $model->createUniqueValidator('gsu_login'));
 
@@ -191,6 +192,7 @@
         $model->set('gsf_gender',           'label', $this->_('Gender'), 'multiOptions', $this->util->getTranslated()->getGenders());
 
         if ($detailed) {
+            $model->set('gsu_user_class',       'default', 'StaffUser');
             $model->set('gsf_iso_lang',         'label', $this->_('Language'), 'multiOptions', $this->util->getLocalized()->getLanguages());
             $model->set('gsf_logout_on_survey', 'label', $this->_('Logout on survey'), 'multiOptions', $this->util->getTranslated()->getYesNo());
         }

Modified: branches/newUser/classes/MUtil/Model/JoinModel.php
===================================================================
--- branches/newUser/classes/MUtil/Model/JoinModel.php	2011-10-27 15:37:58 UTC (rev 148)
+++ branches/newUser/classes/MUtil/Model/JoinModel.php	2011-10-27 15:49:44 UTC (rev 149)
@@ -175,8 +175,7 @@
         $filter = $this->_checkFilterUsed($filter);
 
         if ($this->_deleteValues) {
-            MUtil_Echo::track($filter);
-            $changed = $this->save($this->_deleteValues, $filter, $saveTables);
+            $changed = $this->save($this->_deleteValues + $filter, $filter, $saveTables);
         } else {
             $changed = 0;
             foreach ($saveTables as $table_name) {

Modified: branches/newUser/configs/db/patches.sql
===================================================================
--- branches/newUser/configs/db/patches.sql	2011-10-27 15:37:58 UTC (rev 148)
+++ branches/newUser/configs/db/patches.sql	2011-10-27 15:49:44 UTC (rev 149)
@@ -227,3 +227,5 @@
         FROM gems__staff;
 
 ALTER TABLE `gems__staff` CHANGE `gsf_id_user` `gsf_id_user` BIGINT( 20 ) UNSIGNED NOT NULL;
+
+ALTER TABLE `gems__staff` DROP INDEX `gsf_login`;
\ No newline at end of file

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