diff --git a/adminstuds.php b/adminstuds.php index b47ea03..b9497dd 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -387,15 +387,15 @@ if (!empty($_GET['delete_column'])) { // Add a slot // ------------------------------- -if (isset($_GET['add_slot'])) { +if (isset($_GET['add_column'])) { $smarty->assign('poll_id', $poll_id); $smarty->assign('admin_poll_id', $admin_poll_id); $smarty->assign('format', $poll->format); $smarty->assign('title', __('Generic', 'Poll') . ' - ' . $poll->title); - $smarty->display('add_slot.tpl'); + $smarty->display('add_column.tpl'); exit; } -if (isset($_POST['confirm_add_slot'])) { +if (isset($_POST['confirm_add_column'])) { try { if ($poll->format === 'D') { $newdate = strip_tags($_POST['newdate']); diff --git a/app/classes/Framadate/Services/AdminPollService.php b/app/classes/Framadate/Services/AdminPollService.php index de63509..500e528 100644 --- a/app/classes/Framadate/Services/AdminPollService.php +++ b/app/classes/Framadate/Services/AdminPollService.php @@ -200,7 +200,7 @@ class AdminPollService { * @throws MomentAlreadyExistsException When the moment to add already exists in database */ public function addDateSlot($poll_id, $datetime, $new_moment) { - $this->logService->log('ADD_SLOT', 'id:' . $poll_id . ', datetime:' . $datetime . ', moment:' . $new_moment); + $this->logService->log('ADD_COLUMN', 'id:' . $poll_id . ', datetime:' . $datetime . ', moment:' . $new_moment); $slots = $this->slotRepository->listByPollId($poll_id); $result = $this->findInsertPosition($slots, $datetime); @@ -243,7 +243,7 @@ class AdminPollService { * @throws MomentAlreadyExistsException When the moment to add already exists in database */ public function addClassicSlot($poll_id, $title) { - $this->logService->log('ADD_SLOT', 'id:' . $poll_id . ', title:' . $title); + $this->logService->log('ADD_COLUMN', 'id:' . $poll_id . ', title:' . $title); $slots = $this->slotRepository->listByPollId($poll_id); diff --git a/tpl/add_slot.tpl b/tpl/add_column.tpl similarity index 93% rename from tpl/add_slot.tpl rename to tpl/add_column.tpl index 3ef5e5e..8fa0c55 100644 --- a/tpl/add_slot.tpl +++ b/tpl/add_column.tpl @@ -32,7 +32,7 @@ {/if}
- +
diff --git a/tpl/part/vote_table_classic.tpl b/tpl/part/vote_table_classic.tpl index fa496ef..c321cc0 100644 --- a/tpl/part/vote_table_classic.tpl +++ b/tpl/part/vote_table_classic.tpl @@ -21,7 +21,7 @@ {/foreach} - {__('Poll results', 'Add a column')} diff --git a/tpl/part/vote_table_date.tpl b/tpl/part/vote_table_date.tpl index 2afb20b..03ad351 100644 --- a/tpl/part/vote_table_date.tpl +++ b/tpl/part/vote_table_date.tpl @@ -27,7 +27,7 @@ {/foreach} {/foreach} - {__('Poll results', 'Add a column')}