daniel/dumbo
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix: Gesamtsumme der Stimmen auf /beliebt wieder korrekt. Auf Film-Seite, inaktive Nutzer gekennzeichnet.

Browse Source
This commit is contained in:
Daniel
2016-05-20 05:39:35 +02:00
parent 372eadd0d9
commit d0b73e92ec
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/Film.php
View File

@@ -26,7 +26,7 @@ class Film extends Eloquent {
public function scopeMeistgewunschteVorschlage($query) { public function scopeMeistgewunschteVorschlage($query) {
$nextfilm = Dumbo::find(1)->film; $nextfilm = Dumbo::find(1)->film;
return $query return $query
->addSelect(DB::raw('film_films.*, COUNT(case when film_votes.stimme IS TRUE then 1 end) as upvotes')) ->addSelect(DB::raw('film_films.*, COUNT(case when film_votes.stimme IS TRUE then 1 end) as upvotes, COUNT(*) as votes'))
->leftJoin('votes', 'votes.film', '=', 'films.id') ->leftJoin('votes', 'votes.film', '=', 'films.id')
->leftJoin('users', 'users.id', '=', 'votes.user') ->leftJoin('users', 'users.id', '=', 'votes.user')
->whereNull('gesehen') ->whereNull('gesehen')

4
app/models/User.php
View File

@@ -70,9 +70,9 @@ class User extends Eloquent implements UserInterface, RemindableInterface {
public function setSetting($key, $value) { public function setSetting($key, $value) {
$settings = json_decode($this->settings); $settings = json_decode($this->settings);
if(is_null($settings)) { if(is_null($settings)) {
$settings = array(); $settings = new stdClass();
} }
$settings[$key] = $value; $settings->$key = $value;
$this->settings = json_encode($settings); $this->settings = json_encode($settings);
} }

4
app/views/film.blade.php
View File

@@ -109,7 +109,7 @@
<dt>Daf&uuml;r</dt> <dt>Daf&uuml;r</dt>
<dd> <dd>
@foreach($pv as $v) @foreach($pv as $v)
<span class="badge"> <span class="badge" {{ $v->getSetting('disabled') ? 'style="color: #c77; font-style: italic;"' : '' }}>
<img class="img-circle" src="{{ $v->getAvatar() }}" width="20"> {{$v->name}} <img class="img-circle" src="{{ $v->getAvatar() }}" width="20"> {{$v->name}}
</span>&nbsp; </span>&nbsp;
@endforeach @endforeach
@@ -118,7 +118,7 @@
<dt>Nicht daf&uuml;r</dt> <dt>Nicht daf&uuml;r</dt>
<dd> <dd>
@foreach($nv as $v) @foreach($nv as $v)
<span class="badge"> <span class="badge" {{ $v->getSetting('disabled') ? 'style="color: #c77; font-style: italic"' : '' }}>
<img class="img-circle" src="{{ $v->getAvatar() }}" width="20"> {{$v->name}} <img class="img-circle" src="{{ $v->getAvatar() }}" width="20"> {{$v->name}}
</span>&nbsp; </span>&nbsp;
@endforeach @endforeach

2
app/views/suggest.blade.php
View File

@@ -27,7 +27,7 @@
$vp = $film->upvotes; $vp = $film->upvotes;
$np = $film->downvotes; $np = $film->downvotes;
?> ?>
<span class="glyphicon glyphicon-transfer"></span>&nbsp;{{ $vp + $np }} <span class="glyphicon glyphicon-transfer"></span>&nbsp;{{ $np != null ? $vp + $np : $film->votes }}
</td> </td>
<td> <td>
@if(($vp) > 0) <span class="label label-default">+{{$vp}}</span> @if(($vp) > 0) <span class="label label-default">+{{$vp}}</span>