Merge de03a06 into 16be7fb

config/Migrations/20160510151928_modify_users_to_integer.php

@@ -0,0 +1,43 @@
+<?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

@@ -515,6 +515,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']);