Improve launderette rights to match with launderette club

launderette/models.py

@@ -3,10 +3,11 @@ from django.utils.translation import ugettext_lazy as _
 from django.conf import settings
 from django.core.urlresolvers import reverse
 
-from core.models import User
 from counter.models import Counter, Product
+from core.models import User
 from subscription.models import Subscriber
 from subscription.views import get_subscriber
+from club.models import Club
 
 # Create your models here.
 
@@ -21,13 +22,18 @@ class Launderette(models.Model):
         """
         Method to see if that object can be edited by the given user
         """
-        if user.is_in_group(settings.SITH_GROUPS['launderette-admin']['name']):
+        launderette_club = Club.objects.filter(unix_name=settings.SITH_LAUNDERETTE_MANAGER['unix_name']).first()
+        m = launderette_club.get_membership_for(user)
+        if m and m.role >= 9:
             return True
         return False
 
     def can_be_edited_by(self, user):
-        sub = get_subscriber(user)
-        return sub in self.counter.sellers.all()
+        launderette_club = Club.objects.filter(unix_name=settings.SITH_LAUNDERETTE_MANAGER['unix_name']).first()
+        m = launderette_club.get_membership_for(user)
+        if m and m.role >= 2:
+            return True
+        return False
 
     def can_be_viewed_by(self, user):
         return user.is_in_group(settings.SITH_MAIN_MEMBERS_GROUP)
@@ -63,7 +69,9 @@ class Machine(models.Model):
         """
         Method to see if that object can be edited by the given user
         """
-        if user.is_in_group(settings.SITH_GROUPS['launderette-admin']['name']):
+        launderette_club = Club.objects.filter(unix_name=settings.SITH_LAUNDERETTE_MANAGER['unix_name']).first()
+        m = launderette_club.get_membership_for(user)
+        if m and m.role >= 9:
             return True
         return False
 
@@ -95,7 +103,9 @@ class Token(models.Model):
         """
         Method to see if that object can be edited by the given user
         """
-        if user.is_in_group(settings.SITH_GROUPS['launderette-admin']['name']):
+        launderette_club = Club.objects.filter(unix_name=settings.SITH_LAUNDERETTE_MANAGER['unix_name']).first()
+        m = launderette_club.get_membership_for(user)
+        if m and m.role >= 9:
             return True
         return False
 

launderette/templates/launderette/launderette_admin.jinja

@@ -19,9 +19,19 @@
 <hr>
 <h3>{% trans %}Tokens{% endtrans %}</h3>
 <p>
-<form method="post" action="">
+<form method="post" action="" id="token_form">
     {% csrf_token %}
-    {{ form.as_p() }}
+    <p>{{ form.action.errors }}<label for="{{ form.action.name }}">{{ form.action.label }}</label>
+    {% for c in form.action %}
+        {{ c }}
+    {% endfor %}
+    </p>
+    <p>{{ form.token_type.errors }}<label for="{{ form.token_type.name }}">{{ form.token_type.label }}</label>
+    {% for c in form.token_type %}
+        {{ c }}
+    {% endfor %}
+    </p>
+    {{ form.tokens }}
     <p><input type="submit" value="{% trans %}Go{% endtrans %}" /></p>
 </form>
 </p>

launderette/views.py

@@ -143,13 +143,15 @@ class LaunderetteCreateView(CanCreateMixin, CreateView):
         return super(LaunderetteCreateView, self).form_valid(form)
 
 class ManageTokenForm(forms.Form):
-    action = forms.ChoiceField(choices=[("BACK", _("Back")), ("ADD", _("Add")), ("DEL", _("Delete"))], label=_("Action"))
-    token_type = forms.ChoiceField(choices=settings.SITH_LAUNDERETTE_MACHINE_TYPES, label=_("Type"))
+    action = forms.ChoiceField(choices=[("BACK", _("Back")), ("ADD", _("Add")), ("DEL", _("Delete"))], initial="BACK",
+            label=_("Action"), widget=forms.RadioSelect)
+    token_type = forms.ChoiceField(choices=settings.SITH_LAUNDERETTE_MACHINE_TYPES, label=_("Type"), initial="WASHING",
+            widget=forms.RadioSelect)
     tokens = forms.CharField(max_length=512, widget=forms.widgets.Textarea, label=_("Tokens, separated by spaces"))
 
     def process(self, launderette):
         cleaned_data = self.cleaned_data
-        token_list = cleaned_data['tokens'].strip(" ").split(" ")
+        token_list = cleaned_data['tokens'].strip(" \n\r").split(" ")
         token_type = cleaned_data['token_type']
         self.data = {}
         if cleaned_data['action'] == "BACK":