michal/movieclub
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

base: michal:main
Branches Tags
michal:main
michal:ci
..
compare: michal:ci
Branches Tags
michal:main
michal:ci

No commits in common. "main" and "ci" have entirely different histories.
main ... ci

3 changed files with 6 additions and 7 deletions
Show Stats Expand all files Collapse all files

4
.drone.yml
View File

@ -6,8 +6,8 @@ steps:
- name: test - name: test
image: python:3.10 image: python:3.10
commands: commands:
- pip3 install poetry --quiet - pip3 install poetry
- poetry install --no-root --quiet - poetry install --no-root
- export SECRET_KEY=$(openssl rand -hex 32) - export SECRET_KEY=$(openssl rand -hex 32)
- export DATABASE_URL=sqlite://$(mktemp)/db.sqlite3 - export DATABASE_URL=sqlite://$(mktemp)/db.sqlite3
- poetry run ./manage.py test - poetry run ./manage.py test

4
watchlist/models.py
View File

@ -29,11 +29,11 @@ class Movie(models.Model):
@property @property
def score(self): def score(self):
return reduce(lambda result,v: result+v.vote, self.movievote_set.filter(user__is_active=True).all(), 0) return reduce(lambda result,v: result+v.vote, self.movievote_set.all(), 0)
@property @property
def seen_score(self): def seen_score(self):
return reduce(lambda result,v: result+int(v.seen), self.movievote_set.filter(user__is_active=True).all(), 0) return reduce(lambda result,v: result+int(v.seen), self.movievote_set.all(), 0)
def __str__(self): def __str__(self):
return self.name return self.name

5
watchlist/views.py
View File

@ -1,4 +1,3 @@
from django.db.models import Q
from django.http import HttpResponseRedirect, HttpResponseBadRequest, HttpResponseForbidden from django.http import HttpResponseRedirect, HttpResponseBadRequest, HttpResponseForbidden
from django.views import generic from django.views import generic
from django.views.decorators.http import require_http_methods, require_safe, require_POST from django.views.decorators.http import require_http_methods, require_safe, require_POST
@ -37,7 +36,7 @@ class DetailView(generic.DetailView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
votes = self.object.movievote_set.filter(user__is_active=True).all() votes = self.object.movievote_set.all()
user_vote = None user_vote = None
if self.request.user.is_authenticated: if self.request.user.is_authenticated:
user_vote = votes.filter(user=self.request.user).first() user_vote = votes.filter(user=self.request.user).first()
@ -71,7 +70,7 @@ class EditView(generic.DetailView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
context["users"] = User.objects.filter(Q(is_active=True) | Q(id=self.object.suggested_by.id)).all() if self.request.user.has_perm("watchlist.moderate_movies") else None context["users"] = User.objects.all() if self.request.user.has_perm("watchlist.moderate_movies") else None
context["error"] = self.request.GET.get("error", None) context["error"] = self.request.GET.get("error", None)
return context return context