Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
services
t3o sites
voting.typo3.org
extensions
election
Commits
1da45e10
Commit
1da45e10
authored
Mar 19, 2019
by
Stefan Busemann
Browse files
[BUGFIX] Show result status of an election
parent
2ebf5740
Changes
3
Hide whitespace changes
Inline
Side-by-side
Classes/Domain/Model/Election.php
View file @
1da45e10
...
...
@@ -202,20 +202,19 @@ class Election extends AbstractEntity
return
false
;
}
//
// /** @return bool
// */
// public function isElectionPlanned()
// {
// if ($this->getStartDate() === null) {
// return true;
// }
// if ($this->getStartDate()->getTimestamp() > time()) {
// return true;
// }
//
// return false;
// }
/** @return bool
*/
public
function
isElectionPlanned
()
{
if
(
$this
->
getStartDate
()
===
null
)
{
return
true
;
}
if
(
$this
->
getStartDate
()
->
getTimestamp
()
>
time
())
{
return
true
;
}
return
false
;
}
/**
* @return array
...
...
Resources/Private/Language/locallang.xlf
View file @
1da45e10
...
...
@@ -484,7 +484,7 @@
<trans-unit
id=
"view.fe.election.show.active"
>
<source>
Voting in Progress
</source>
</trans-unit>
<trans-unit
id=
"view.fe.election.show.
active
"
>
<trans-unit
id=
"view.fe.election.show.
planned
"
>
<source>
Voting planned
</source>
</trans-unit>
<trans-unit
id=
"view.fe.election.show.nominee"
>
...
...
Resources/Private/Templates/FeElection/Show.html
View file @
1da45e10
...
...
@@ -24,7 +24,7 @@
<f:translate
key=
"view.fe.election.show.nominee"
/>
</th>
<th>
Status
<f:translate
key=
"view.fe.election.show.votes"
/>
</th>
</tr>
</thead>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment