Chapril/date.chapril.org-framadate
Chapril
/
date.chapril.org-framadate
23
1
Fork 0
Code Issues Pull Requests Releases Activity

Rename add_slot by add_column

This commit is contained in:
Olivier PEREZ 2015-11-30 20:38:53 +01:00
parent 5d4958e1f4
commit 5750a36172
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
adminstuds.php
View File

@ -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']);

4
app/classes/Framadate/Services/AdminPollService.php
View File

@ -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);

2
tpl/add_slot.tpl → tpl/add_column.tpl
View File

@ -32,7 +32,7 @@
{/if}
<div class="form-group">
<button class="btn btn-default" type="submit" name="back">{__('adminstuds', 'Back to the poll')}</button>
<button type="submit" name="confirm_add_slot" class="btn btn-success">{__('adminstuds', 'Add a column')}</button>
<button type="submit" name="confirm_add_column" class="btn btn-success">{__('adminstuds', 'Add a column')}</button>
</div>
</div>
</form>

2
tpl/part/vote_table_classic.tpl
View File

@ -21,7 +21,7 @@
</td>
{/foreach}
<td>
<a href="{poll_url id=$admin_poll_id admin=true action='add_slot'}"
<a href="{poll_url id=$admin_poll_id admin=true action='add_column'}"
class="btn btn-link btn-sm" title="{__('adminstuds', 'Add a column')}">
<i class="glyphicon glyphicon-plus text-success"></i><span class="sr-only">{__('Poll results', 'Add a column')}</span>
</a>

2
tpl/part/vote_table_date.tpl
View File

@ -27,7 +27,7 @@
{/foreach}
{/foreach}
<td>
<a href="{poll_url id=$admin_poll_id admin=true action='add_slot'}"
<a href="{poll_url id=$admin_poll_id admin=true action='add_column'}"
class="btn btn-link btn-sm" title="{__('adminstuds', 'Add a column')}">
<i class="glyphicon glyphicon-plus text-success"></i><span class="sr-only">{__('Poll results', 'Add a column')}</span>
</a>