Mirrors/framadate
1
0
Fork 0
mirror of https://framagit.org/framasoft/framadate/framadate synced 2026-01-23 02:14:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bug/vote-rempli-si-erreur-nom' into 'develop'

Browse source 
Bug/vote rempli si erreur nom

See merge request framasoft/framadate!284
This commit is contained in:
Thomas Citharel 2018-04-08 21:54:24 +02:00
commit 412b409397
4 changed files with 34 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
adminstuds.php
View file

@ -201,6 +201,8 @@ if (!empty($_GET['vote'])) {
// Something to save (edit or add)
// -------------------------------
$selectedNewVotes = [];
if (!empty($_POST['save'])) { // Save edition of an old vote
$name = $inputService->filterName($_POST['name']);
$editedVote = filter_input(INPUT_POST, 'save', FILTER_VALIDATE_INT);
@ -254,6 +256,7 @@ if (!empty($_POST['save'])) { // Save edition of an old vote
}
} catch (AlreadyExistsException $aee) {
$message = new Message('danger', __('Error', 'You already voted'));
$selectedNewVotes = $choices;
} catch (ConcurrentEditionException $cee) {
$message = new Message('danger', __('Error', 'Poll has been updated before you vote'));
} catch (ConcurrentVoteException $cve) {
@ -447,5 +450,6 @@ $smarty->assign('accessGranted', true);
$smarty->assign('resultPubliclyVisible', true);
$smarty->assign('editedVoteUniqueId', '');
$smarty->assign('default_to_marldown_editor', $config['markdown_editor_by_default']);
$smarty->assign('selectedNewVotes', $selectedNewVotes);
$smarty->display('studs.tpl');