nextcloud
/
polls
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fixed some minor bugs

This commit is contained in:
Vinzenz Rosenkranz 2016-02-25 20:56:35 +01:00
Родитель 0ee158b6a4
Коммит 4a9e3e1992
4 изменённых файлов: 16 добавлений и 15 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
controller/pagecontroller.php
Просмотреть файл

@ -343,6 +343,7 @@ class PageController extends Controller {
$dates = json_decode($dates);
$types = json_decode($types);
$this->participationMapper->deleteByPollAndUser($pollId, $userId);
for($i=0; $i<count($dates); $i++) {
$part = new Participation();
$part->setPollId($pollId);

6
templates/create.tmpl.php
Просмотреть файл

@ -29,10 +29,10 @@
?>
<?php if($isUpdate): ?>
<form name="finish_poll" action="<?php p($urlGenerator->linkToRoute('polls.page.update_poll', null, true)); ?>" method="POST">
<form name="finish_poll" action="<?php p($urlGenerator->linkToRoute('polls.page.update_poll')); ?>" method="POST">
<input type="hidden" name="pollId" value="<?php p($poll->getId()); ?>" />
<?php else: ?>
<form name="finish_poll" action="<?php p($urlGenerator->linkToRoute('polls.page.insert_poll', null, true)); ?>" method="POST">
<form name="finish_poll" action="<?php p($urlGenerator->linkToRoute('polls.page.insert_poll')); ?>" method="POST">
<?php endif; ?>
<input type="hidden" name="chosenDates" id="chosenDates" value="<?php if(isset($chosen)) p($chosen); ?>" />
<input type="hidden" name="expireTs" id="expireTs" value="<?php if(isset($expireTs)) p($expireTs); ?>" />
@ -98,7 +98,7 @@
</div>
<br/>
<a href="<?php p($urlGenerator->linkToRoute('polls.page.index', null, true)); ?>"><input type="button" id="submit_cancel_poll" value="<?php p($l->t('Cancel')); ?>" /></a>
<a href="<?php p($urlGenerator->linkToRoute('polls.page.index')); ?>"><input type="button" id="submit_cancel_poll" value="<?php p($l->t('Cancel')); ?>" /></a>
<input type="submit" id="submit_finish_poll" value="<?php p($l->t('Next')); ?>" />
</div>
</form>

18
templates/goto.tmpl.php
Просмотреть файл

@ -11,6 +11,7 @@ $poll = $_['poll'];
$dates = $_['dates'];
$votes = $_['votes'];
$comments = $_['comments'];
$notification = $_['notification'];
$poll_type = $poll->getType();
if ($poll->getExpire() === null) $expired = false;
else {
@ -91,8 +92,7 @@ else $line = $l->t('No description provided.');
<h2><?php p($l->t('Poll URL')); ?></h2>
<p class="url">
<?php
$url = $urlGenerator->linkToRoute('polls.page.goto_poll', ['hash' => $poll->getHash()], true);
//$url = $urlGenerator->getAbsoluteURL($url);
$url = $urlGenerator->linkToRoute('polls.page.goto_poll', ['hash' => $poll->getHash()]);
?>
<a href="<?php p($url);?>"><?php p($url); ?></a>
</p>
@ -118,8 +118,8 @@ else $line = $l->t('No description provided.');
print_unescaped('<tr><th></th>' . $for_string_dates . '</tr>');
print_unescaped('<tr><th></th>');
for ($i = 0; $i < count($chosen); $i++) {
$ch_obj = date('H:i', strtotime($chosen[$i]));
for ($i = 0; $i < count($dates); $i++) {
$ch_obj = date('H:i', strtotime($dates[$i]->getDt()));
print_unescaped('<th>' . $ch_obj . '</th>');
}
print_unescaped('</tr>');
@ -317,8 +317,8 @@ else $line = $l->t('No description provided.');
print_unescaped('<th>' . $for_string_years . '</th>');
}
else {
foreach ($chosen as $el) {
print_unescaped('<th title="' . $el->desc . '">' . $el->dt . '</th>');
foreach ($dates as $el) {
print_unescaped('<th title="' . $el->getText() . '">' . $el->getText() . '</th>');
}
}
?>
@ -332,8 +332,8 @@ else $line = $l->t('No description provided.');
<br/>
<?php endif; ?>
<a href="<?php p($urlGenerator->linkToRoute('polls.page.index', null, true)); ?>" style="float:left;padding-right: 5px;"><input type="button" class="icon-home" /></a>
<form name="finish_vote" action="<?php p($urlGenerator->linkToRoute('polls.page.insert_vote', null, true)); ?>" method="POST">
<a href="<?php p($urlGenerator->linkToRoute('polls.page.index')); ?>" style="float:left;padding-right: 5px;"><input type="button" class="icon-home" /></a>
<form name="finish_vote" action="<?php p($urlGenerator->linkToRoute('polls.page.insert_vote')); ?>" method="POST">
<input type="hidden" name="pollId" value="<?php p($poll->getId()); ?>" />
<input type="hidden" name="userId" value="<?php p($userId); ?>" />
<input type="hidden" name="dates" value="<?php p($poll->getId()); ?>" />
@ -372,7 +372,7 @@ else $line = $l->t('No description provided.');
<?php p($l->t('No comments yet. Be the first.')); ?>
<?php endif; ?>
<div class="cl_comment">
<form name="send_comment" action="<?php p($urlGenerator->linkToRoute('polls.page.insert_comment', null, true)); ?>" method="POST">
<form name="send_comment" action="<?php p($urlGenerator->linkToRoute('polls.page.insert_comment')); ?>" method="POST">
<input type="hidden" name="pollId" value="<?php p($poll->getId()); ?>" />
<input type="hidden" name="userId" value="<?php p($userId); ?>" />
<?php // -------- leave comment ---------- ?>

6
templates/main.tmpl.php
Просмотреть файл

@ -10,7 +10,7 @@
<h1><?php p($l->t('Summary')); ?></h1>
<div class="goto_poll">
<?php
$url = $urlGenerator->linkToRoute('polls.page.index', []);
$url = $urlGenerator->linkToRoute('polls.page.index');
?>
<?php if(count($_['polls']) === 0) : ?>
<?php p($l->t('No existing polls.')); ?>
@ -104,11 +104,11 @@
</tr>
<?php endforeach; ?>
</table>
<form id="form_delete_poll" name="form_delete_poll" action="<?php p($urlGenerator->linkToRoute('polls.page.delete_poll', [])); ?>" method="POST">
<form id="form_delete_poll" name="form_delete_poll" action="<?php p($urlGenerator->linkToRoute('polls.page.delete_poll')); ?>" method="POST">
</form>
<?php endif; ?>
</div>
<a href="<?php p($urlGenerator->linkToRoute('polls.page.create_poll', [])); ?>"><input type="button" id="submit_new_poll" class="icon-add" /></a>
<a href="<?php p($urlGenerator->linkToRoute('polls.page.create_poll')); ?>"><input type="button" id="submit_new_poll" class="icon-add" /></a>
<?php
// ---- helper functions ----