-
Notifications
You must be signed in to change notification settings - Fork 46
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'Justine/Issue1' into 'develop'
Collecting polled users emails Closes #38 See merge request framasoft/framadate!266
- Loading branch information
Showing
18 changed files
with
391 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
app/classes/Framadate/Migration/AddColumn_collect_mail_In_poll.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| <?php | ||
| /** | ||
| * This software is governed by the CeCILL-B license. If a copy of this license | ||
| * is not distributed with this file, you can obtain one at | ||
| * http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt | ||
| * | ||
| * Authors of STUdS (initial project): Guilhem BORGHESI (borghesi@unistra.fr) and Raphaël DROZ | ||
| * Authors of Framadate/OpenSondage: Framasoft (https://github.com/framasoft) | ||
| * | ||
| * ============================= | ||
| * | ||
| * Ce logiciel est régi par la licence CeCILL-B. Si une copie de cette licence | ||
| * ne se trouve pas avec ce fichier vous pouvez l'obtenir sur | ||
| * http://www.cecill.info/licences/Licence_CeCILL-B_V1-fr.txt | ||
| * | ||
| * Auteurs de STUdS (projet initial) : Guilhem BORGHESI (borghesi@unistra.fr) et Raphaël DROZ | ||
| * Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft) | ||
| */ | ||
| namespace Framadate\Migration; | ||
|
|
||
| use Framadate\Utils; | ||
|
|
||
| /** | ||
| * This migration adds the field uniqId on the vote table. | ||
| * | ||
| * @package Framadate\Migration | ||
| * @version 0.9 | ||
| */ | ||
| class AddColumn_collect_mail_In_poll implements Migration { | ||
| function __construct() { | ||
| } | ||
|
|
||
| /** | ||
| * This method should describe in english what is the purpose of the migration class. | ||
| * | ||
| * @return string The description of the migration class | ||
| */ | ||
| function description() { | ||
| return 'Add column collect_users_mail in table poll'; | ||
| } | ||
|
|
||
| /** | ||
| * This method could check if the execute method should be called. | ||
| * It is called before the execute method. | ||
| * | ||
| * @param \PDO $pdo The connection to database | ||
| * @return bool true is the Migration should be executed. | ||
| */ | ||
| function preCondition(\PDO $pdo) { | ||
| return true; | ||
| } | ||
|
|
||
| /** | ||
| * This method is called only one time in the migration page. | ||
| * | ||
| * @param \PDO $pdo The connection to database | ||
| * @return bool true is the execution succeeded | ||
| */ | ||
| function execute(\PDO $pdo) { | ||
| $this->alterVoteTable($pdo); | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| private function alterVoteTable(\PDO $pdo) { | ||
| $pdo->exec(' | ||
| ALTER TABLE `' . Utils::table('poll') . '` | ||
| ADD `collect_users_mail` TINYINT DEFAULT 0;'); | ||
| } | ||
| } |
70 changes: 70 additions & 0 deletions
70
app/classes/Framadate/Migration/AddColumn_mail_In_vote.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| <?php | ||
| /** | ||
| * This software is governed by the CeCILL-B license. If a copy of this license | ||
| * is not distributed with this file, you can obtain one at | ||
| * http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt | ||
| * | ||
| * Authors of STUdS (initial project): Guilhem BORGHESI (borghesi@unistra.fr) and Raphaël DROZ | ||
| * Authors of Framadate/OpenSondage: Framasoft (https://github.com/framasoft) | ||
| * | ||
| * ============================= | ||
| * | ||
| * Ce logiciel est régi par la licence CeCILL-B. Si une copie de cette licence | ||
| * ne se trouve pas avec ce fichier vous pouvez l'obtenir sur | ||
| * http://www.cecill.info/licences/Licence_CeCILL-B_V1-fr.txt | ||
| * | ||
| * Auteurs de STUdS (projet initial) : Guilhem BORGHESI (borghesi@unistra.fr) et Raphaël DROZ | ||
| * Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft) | ||
| */ | ||
| namespace Framadate\Migration; | ||
|
|
||
| use Framadate\Utils; | ||
|
|
||
| /** | ||
| * This migration adds the field uniqId on the vote table. | ||
| * | ||
| * @package Framadate\Migration | ||
| * @version 0.9 | ||
| */ | ||
| class AddColumn_mail_In_vote implements Migration { | ||
| function __construct() { | ||
| } | ||
|
|
||
| /** | ||
| * This method should describe in english what is the purpose of the migration class. | ||
| * | ||
| * @return string The description of the migration class | ||
| */ | ||
| function description() { | ||
| return 'Add column mail in table vote'; | ||
| } | ||
|
|
||
| /** | ||
| * This method could check if the execute method should be called. | ||
| * It is called before the execute method. | ||
| * | ||
| * @param \PDO $pdo The connection to database | ||
| * @return bool true is the Migration should be executed. | ||
| */ | ||
| function preCondition(\PDO $pdo) { | ||
| return true; | ||
| } | ||
|
|
||
| /** | ||
| * This method is called only one time in the migration page. | ||
| * | ||
| * @param \PDO $pdo The connection to database | ||
| * @return bool true is the execution succeeded | ||
| */ | ||
| function execute(\PDO $pdo) { | ||
| $this->alterVoteTable($pdo); | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| private function alterVoteTable(\PDO $pdo) { | ||
| $pdo->exec(' | ||
| ALTER TABLE `' . Utils::table('vote') . '` | ||
| ADD `mail` VARCHAR(320) DEFAULT NULL;'); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.