Merge 428a2f0 into 16be7fb

config/Migrations/20160510151928_modify_users_to_integer.php

@@ -0,0 +1,39 @@
+<?php
+
+use Phinx\Migration\AbstractMigration;
+
+class ModifyUsersToInteger extends AbstractMigration
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
+     *
+     * The following commands can be used in this method and Phinx will
+     * automatically reverse them when rolling back:
+     *
+     *    createTable
+     *    renameTable
+     *    addColumn
+     *    renameColumn
+     *    addIndex
+     *    addForeignKey
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change()
+    {
+        $this->execute('UPDATE users SET gender = 2 WHERE gender IS NULL ');
+
+        $table = $this->table('users');
+        $table->changeColumn('gender', 'integer', [
+            'default' => 2,
+            'limit' => 2,
+            'null' => false
+        ]);
+    }
+}

src/Controller/UsersController.php

@@ -499,6 +499,7 @@ public function edit($id = null)
 
             if ($this->request->is(['patch', 'post', 'put'])) {
                 $user = $this->Users->patchEntity($user, $this->request->data);
+                $user->set('gender', 2);
 
                 if ($this->Users->save($user)) {
                     //Update the language
@@ -515,6 +516,7 @@ public function edit($id = null)
                     );
                 }
             }
+
             $universities = $this->Users->Universities->find('list', ['limit' => 200]);
             $this->set(compact('user', 'universities', 'you', 'typeOptions', 'selectedTypeMissions'));
             $this->set('_serialize', ['user']);

src/Template/Users/edit.ctp

@@ -36,7 +36,7 @@
                             <?= $this->Form->label('gender', __('Gender'), ['class' => 'control-label']); ?>
                             <select class="form-control" name="gender">
                                 <option
-                                    value="null" <?= (is_null($user->getGender()) ? "selected" : ""); ?>><?= __('Not specified'); ?></option>
+                                    value="2" <?= (is_null($user->getGender()) ? "selected" : ""); ?>><?= __('Not specified'); ?></option>
                                 <option
                                     value="0" <?= (!$user->getGender() && !is_null($user->getGender()) ? "selected" : ""); ?>><?= __('Female'); ?></option>
                                 <option value="1" <?= ($user->getGender() ? "selected" : ""); ?>><?= __('Male'); ?></option>