klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-22 06:03:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update SAS rights

Browse Source
This commit is contained in:
Skia 2016-12-13 18:36:08 +01:00
parent e3c86c1d05
commit d7a065c4e2
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sas/models.py
View File

@ -24,11 +24,13 @@ class Picture(SithFile):
return False return False
def can_be_edited_by(self, user): def can_be_edited_by(self, user):
return user.is_in_group(settings.SITH_GROUP_SAS_ADMIN_ID) file = SithFile.objects.filter(id=self.id).first()
return user.is_in_group(settings.SITH_GROUP_SAS_ADMIN_ID) or user.can_edit(file)
def can_be_viewed_by(self, user): def can_be_viewed_by(self, user):
file = SithFile.objects.filter(id=self.id).first()
return self.can_be_edited_by(user) or (self.is_in_sas and self.is_moderated and return self.can_be_edited_by(user) or (self.is_in_sas and self.is_moderated and
user.was_subscribed()) user.was_subscribed()) or user.can_view(file)
def get_download_url(self): def get_download_url(self):
return reverse('sas:download', kwargs={'picture_id': self.id}) return reverse('sas:download', kwargs={'picture_id': self.id})
@ -87,11 +89,13 @@ class Album(SithFile):
proxy = True proxy = True
def can_be_edited_by(self, user): def can_be_edited_by(self, user):
return user.is_in_group(settings.SITH_GROUP_SAS_ADMIN_ID) file = SithFile.objects.filter(id=self.id).first()
return user.is_in_group(settings.SITH_GROUP_SAS_ADMIN_ID) or user.can_edit(file)
def can_be_viewed_by(self, user): def can_be_viewed_by(self, user):
file = SithFile.objects.filter(id=self.id).first()
return self.can_be_edited_by(user) or (self.is_in_sas and self.is_moderated and return self.can_be_edited_by(user) or (self.is_in_sas and self.is_moderated and
user.was_subscribed()) user.was_subscribed()) or user.can_view(file)
def get_absolute_url(self): def get_absolute_url(self):
return reverse('sas:album', kwargs={'album_id': self.id}) return reverse('sas:album', kwargs={'album_id': self.id})

4
sas/templates/sas/album.jinja
View File

@ -42,7 +42,7 @@
{% if user.can_edit(album) %} {% if user.can_edit(album) %}
<input type="checkbox" name="file_list" value="{{ a.id }}"> <input type="checkbox" name="file_list" value="{{ a.id }}">
{% endif %} {% endif %}
{% if a.as_album.can_be_viewed_by(user) %} {% if user.can_view(a.as_album) %}
<a href="{{ url("sas:album", album_id=a.id) }}" style="display: inline-block"> <a href="{{ url("sas:album", album_id=a.id) }}" style="display: inline-block">
<div class="album{% if not a.is_moderated %} not_moderated{% endif %}"> <div class="album{% if not a.is_moderated %} not_moderated{% endif %}">
<div> <div>
@ -67,7 +67,7 @@
{% if user.can_edit(album) %} {% if user.can_edit(album) %}
<input type="checkbox" name="file_list" value="{{ p.id }}"> <input type="checkbox" name="file_list" value="{{ p.id }}">
{% endif %} {% endif %}
{% if p.as_picture.can_be_viewed_by(user) %} {% if user.can_view(p.as_picture) %}
<div class="picture{% if not p.is_moderated %} not_moderated{% endif %}"> <div class="picture{% if not p.is_moderated %} not_moderated{% endif %}">
<a href="{{ url("sas:picture", picture_id=p.id) }}#pict"> <a href="{{ url("sas:picture", picture_id=p.id) }}#pict">
<img src="{{ p.as_picture.get_download_thumb_url() }}" alt="{{ p.get_display_name() }}" /> <img src="{{ p.as_picture.get_download_thumb_url() }}" alt="{{ p.get_display_name() }}" />

2
sas/templates/sas/picture.jinja
View File

@ -62,7 +62,7 @@
{% for r in picture.people.all() %} {% for r in picture.people.all() %}
<li> <li>
<a href="{{ r.user.get_absolute_url() }}">{{ r.user.get_short_name() }}</a> <a href="{{ r.user.get_absolute_url() }}">{{ r.user.get_short_name() }}</a>
{% if user == r.user or user.is_in_group(settings.SITH_GROUP_SAS_ADMIN_ID) %} {% if user == r.user or user.can_edit(picture) %}
<a href="?remove_user={{ r.user.id }}">{% trans %}Delete{% endtrans %}</a> <a href="?remove_user={{ r.user.id }}">{% trans %}Delete{% endtrans %}</a>
{% endif %} {% endif %}
</li> </li>