klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2025-07-10 11:59:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename and refactor some settings

Browse Source
This commit is contained in:
Skia
2016-03-31 10:36:00 +02:00
parent be826ed616
commit 52153438ac
11 changed files with 83 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
club/models.py
View File

@ -31,7 +31,7 @@ class Club(models.Model):
address = models.CharField(_('address'), max_length=254)
# email = models.EmailField(_('email address'), unique=True) # This should, and will be generated automatically
owner_group = models.ForeignKey(Group, related_name="owned_club",
default=settings.AE_GROUPS['root']['id'])
default=settings.SITH_GROUPS['root']['id'])
edit_groups = models.ManyToManyField(Group, related_name="editable_club", blank=True)
view_groups = models.ManyToManyField(Group, related_name="viewable_club", blank=True)
@ -50,8 +50,8 @@ class Club(models.Model):
def save(self):
super(Club, self).save()
MetaGroup(name=self.unix_name+"-board").save()
MetaGroup(name=self.unix_name+"-members").save()
MetaGroup(name=self.unix_name+settings.SITH_BOARD_SUFFIX).save()
MetaGroup(name=self.unix_name+settings.SITH_MEMBER_SUFFIX).save()
def __str__(self):
return self.name
@ -63,7 +63,7 @@ class Club(models.Model):
"""
Method to see if that object can be super edited by the given user
"""
if user.is_in_group(settings.AE_GROUPS['board']['name']):
if user.is_in_group(settings.SITH_MAIN_BOARD_GROUP):
return True
return False

4
club/tests.py
View File

@ -41,10 +41,10 @@ class ClubTest(TestCase):
self.assertTrue(response.status_code == 200)
self.assertTrue("<li>Woenzel&#39;UT - rbatsbak - Vice-Pr" in str(response.content))
def test_create_add_user_to_club_from_skia_fail(self):
def test_create_add_user_to_club_from_richard_fail(self):
self.client.login(username='root', password='plop')
self.client.post(reverse("club:club_members", kwargs={"club_id":4}), {"user": 2, "role": 3})
self.client.login(username='skia', password='plop')
self.client.login(username='rbatsbak', password='plop')
response = self.client.post(reverse("club:club_members", kwargs={"club_id":4}), {"user": 4, "role": 10})
self.assertTrue(response.status_code == 200)
self.assertTrue("<li>You do not have the permission to do that</li>" in str(response.content))

4
club/views.py
View File

@ -8,7 +8,7 @@ from django.core.exceptions import ValidationError
from core.views import CanViewMixin, CanEditMixin, CanEditPropMixin
from club.models import Club, Membership
from sith.settings import AE_GROUPS, MAXIMUM_FREE_ROLE
from sith.settings import MAXIMUM_FREE_ROLE, SITH_MAIN_BOARD_GROUP
class ClubListView(CanViewMixin, ListView):
"""
@ -44,7 +44,7 @@ class ClubMemberForm(forms.ModelForm):
ms = self.instance.club.get_membership_for(self._user)
if (self.cleaned_data['role'] <= MAXIMUM_FREE_ROLE or
(ms is not None and ms.role >= self.cleaned_data['role']) or
self._user.is_in_group(AE_GROUPS['board']['name']) or
self._user.is_in_group(SITH_MAIN_BOARD_GROUP) or
self._user.is_superuser):
return ret
raise ValidationError("You do not have the permission to do that")