diff --git a/core/admin.py b/core/admin.py
index 6b60ff9c..f091a127 100644
--- a/core/admin.py
+++ b/core/admin.py
@@ -33,8 +33,9 @@ admin.site.unregister(AuthGroup)
admin.site.register(RealGroup)
admin.site.register(Page)
+
@admin.register(SithFile)
class SithFileAdmin(admin.ModelAdmin):
form = make_ajax_form(SithFile, {
'parent': 'files', # ManyToManyField
- })
+ })
diff --git a/core/apps.py b/core/apps.py
index 4fc130bc..8eb1cf65 100644
--- a/core/apps.py
+++ b/core/apps.py
@@ -23,9 +23,9 @@
#
from django.apps import AppConfig
-from django.dispatch import receiver
from django.core.signals import request_started
+
class SithConfig(AppConfig):
name = 'core'
verbose_name = "Core app of the Sith"
@@ -48,4 +48,3 @@ class SithConfig(AppConfig):
request_started.connect(clear_cached_groups, weak=False, dispatch_uid="clear_cached_groups")
request_started.connect(clear_cached_memberships, weak=False, dispatch_uid="clear_cached_memberships")
# TODO: there may be a need to add more cache clearing
-
diff --git a/core/lookups.py b/core/lookups.py
index b8fd7c44..3a77e915 100644
--- a/core/lookups.py
+++ b/core/lookups.py
@@ -31,16 +31,19 @@ from club.models import Club
from counter.models import Product, Counter
from accounting.models import ClubAccount, Company
+
def check_token(request):
return ('counter_token' in request.session.keys() and
- request.session['counter_token'] and
- Counter.objects.filter(token=request.session['counter_token']).exists())
+ request.session['counter_token'] and
+ Counter.objects.filter(token=request.session['counter_token']).exists())
+
class RightManagedLookupChannel(LookupChannel):
def check_auth(self, request):
if not request.user.was_subscribed and not check_token(request):
raise PermissionDenied
+
@register('users')
class UsersLookup(RightManagedLookupChannel):
model = User
@@ -54,6 +57,7 @@ class UsersLookup(RightManagedLookupChannel):
def format_item_display(self, item):
return item.get_display_name()
+
@register('groups')
class GroupsLookup(RightManagedLookupChannel):
model = Group
@@ -67,6 +71,7 @@ class GroupsLookup(RightManagedLookupChannel):
def format_item_display(self, item):
return item.name
+
@register('clubs')
class ClubLookup(RightManagedLookupChannel):
model = Club
@@ -80,6 +85,7 @@ class ClubLookup(RightManagedLookupChannel):
def format_item_display(self, item):
return item.name
+
@register('counters')
class CountersLookup(RightManagedLookupChannel):
model = Counter
@@ -90,6 +96,7 @@ class CountersLookup(RightManagedLookupChannel):
def format_item_display(self, item):
return item.name
+
@register('products')
class ProductsLookup(RightManagedLookupChannel):
model = Product
@@ -101,6 +108,7 @@ class ProductsLookup(RightManagedLookupChannel):
def format_item_display(self, item):
return "%s (%s)" % (item.name, item.code)
+
@register('files')
class SithFileLookup(RightManagedLookupChannel):
model = SithFile
@@ -108,6 +116,7 @@ class SithFileLookup(RightManagedLookupChannel):
def get_query(self, q, request):
return self.model.objects.filter(name__icontains=q)[:50]
+
@register('club_accounts')
class ClubAccountLookup(RightManagedLookupChannel):
model = ClubAccount
@@ -118,6 +127,7 @@ class ClubAccountLookup(RightManagedLookupChannel):
def format_item_display(self, item):
return item.name
+
@register('companies')
class CompaniesLookup(RightManagedLookupChannel):
model = Company
diff --git a/core/management/__init__.py b/core/management/__init__.py
index 0a9419f8..0ace29c4 100644
--- a/core/management/__init__.py
+++ b/core/management/__init__.py
@@ -21,4 +21,3 @@
# Place - Suite 330, Boston, MA 02111-1307, USA.
#
#
-
diff --git a/core/management/commands/compilestatic.py b/core/management/commands/compilestatic.py
index 0d96c8ea..c634bc35 100644
--- a/core/management/commands/compilestatic.py
+++ b/core/management/commands/compilestatic.py
@@ -44,7 +44,6 @@ class Command(BaseCommand):
args['precision'] = settings.SASS_PRECISION
return sass.compile(**args)
-
def is_compilable(self, file, ext_list):
path, ext = os.path.splitext(file)
return ext in ext_list
diff --git a/core/management/commands/populate.py b/core/management/commands/populate.py
index e03b04b9..241832a3 100644
--- a/core/management/commands/populate.py
+++ b/core/management/commands/populate.py
@@ -26,7 +26,7 @@ import os
from datetime import date, datetime
from io import StringIO, BytesIO
-from django.core.management.base import BaseCommand, CommandError
+from django.core.management.base import BaseCommand
from django.core.management import call_command
from django.conf import settings
from django.db import connection
@@ -42,7 +42,7 @@ from subscription.models import Subscription
from counter.models import Customer, ProductType, Product, Counter
from com.models import Sith, Weekmail
from election.models import Election, Role, Candidature, ElectionList
-from forum.models import Forum, ForumMessage, ForumTopic
+from forum.models import Forum, ForumTopic
class Command(BaseCommand):
@@ -75,9 +75,9 @@ class Command(BaseCommand):
Group(name="Forum admin").save()
self.reset_index("core", "auth")
root = User(id=0, username='root', last_name="", first_name="Bibou",
- email="ae.info@utbm.fr",
- date_of_birth="1942-06-12",
- is_superuser=True, is_staff=True)
+ email="ae.info@utbm.fr",
+ date_of_birth="1942-06-12",
+ is_superuser=True, is_staff=True)
root.set_password("plop")
root.save()
profiles_root = SithFile(parent=None, name="profiles", is_folder=True, owner=root)
@@ -88,18 +88,18 @@ class Command(BaseCommand):
club_root.save()
SithFile(parent=None, name="SAS", is_folder=True, owner=root).save()
main_club = Club(id=1, name=settings.SITH_MAIN_CLUB['name'], unix_name=settings.SITH_MAIN_CLUB['unix_name'],
- address=settings.SITH_MAIN_CLUB['address'])
+ address=settings.SITH_MAIN_CLUB['address'])
main_club.save()
bar_club = Club(id=2, name=settings.SITH_BAR_MANAGER['name'], unix_name=settings.SITH_BAR_MANAGER['unix_name'],
- address=settings.SITH_BAR_MANAGER['address'])
+ address=settings.SITH_BAR_MANAGER['address'])
bar_club.save()
launderette_club = Club(id=84, name=settings.SITH_LAUNDERETTE_MANAGER['name'],
- unix_name=settings.SITH_LAUNDERETTE_MANAGER['unix_name'],
- address=settings.SITH_LAUNDERETTE_MANAGER['address'])
+ unix_name=settings.SITH_LAUNDERETTE_MANAGER['unix_name'],
+ address=settings.SITH_LAUNDERETTE_MANAGER['address'])
launderette_club.save()
self.reset_index("club")
for b in settings.SITH_COUNTER_BARS:
- g = Group(name=b[1]+" admin")
+ g = Group(name=b[1] + " admin")
g.save()
c = Counter(id=b[0], name=b[1], club=bar_club, type='BAR')
c.save()
@@ -120,7 +120,7 @@ class Command(BaseCommand):
p = Page(name='Index')
p.set_lock(root)
p.save()
- p.view_groups=[settings.SITH_GROUP_PUBLIC_ID]
+ p.view_groups = [settings.SITH_GROUP_PUBLIC_ID]
p.set_lock(root)
p.save()
PageRev(page=p, title="Wiki index", author=root, content="""
@@ -130,7 +130,7 @@ Welcome to the wiki page!
p = Page(name="services")
p.set_lock(root)
p.save()
- p.view_groups=[settings.SITH_GROUP_PUBLIC_ID]
+ p.view_groups = [settings.SITH_GROUP_PUBLIC_ID]
p.set_lock(root)
PageRev(page=p, title="Services", author=root, content="""
| | | |
@@ -150,18 +150,18 @@ Welcome to the wiki page!
if not options['prod']:
# Adding user Skia
skia = User(username='skia', last_name="Kia", first_name="S'",
- email="skia@git.an",
- date_of_birth="1942-06-12")
+ email="skia@git.an",
+ date_of_birth="1942-06-12")
skia.set_password("plop")
skia.save()
- skia.view_groups=[Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first().id]
+ skia.view_groups = [Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first().id]
skia.save()
skia_profile_path = os.path.join(root_path, 'core/fixtures/images/3.jpg')
with open(skia_profile_path, 'rb') as f:
name = str(skia.id) + "_profile.jpg"
skia_profile = SithFile(parent=profiles_root, name=name,
- file=resize_image(Image.open(BytesIO(f.read())), 400, 'JPEG'),
- owner=skia, is_folder=False, mime_type='image/jpeg', size=os.path.getsize(skia_profile_path))
+ file=resize_image(Image.open(BytesIO(f.read())), 400, 'JPEG'),
+ owner=skia, is_folder=False, mime_type='image/jpeg', size=os.path.getsize(skia_profile_path))
skia_profile.file.name = name
skia_profile.save()
skia.profile_pict = skia_profile
@@ -169,50 +169,50 @@ Welcome to the wiki page!
# Adding user public
public = User(username='public', last_name="Not subscribed", first_name="Public",
- email="public@git.an",
- date_of_birth="1942-06-12",
- is_superuser=False, is_staff=False)
+ email="public@git.an",
+ date_of_birth="1942-06-12",
+ is_superuser=False, is_staff=False)
public.set_password("plop")
public.save()
- public.view_groups=[Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first().id]
+ public.view_groups = [Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first().id]
public.save()
# Adding user Subscriber
subscriber = User(username='subscriber', last_name="User", first_name="Subscribed",
- email="Subscribed@git.an",
- date_of_birth="1942-06-12",
- is_superuser=False, is_staff=False)
+ email="Subscribed@git.an",
+ date_of_birth="1942-06-12",
+ is_superuser=False, is_staff=False)
subscriber.set_password("plop")
subscriber.save()
- subscriber.view_groups=[Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first().id]
+ subscriber.view_groups = [Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first().id]
subscriber.save()
# Adding user old Subscriber
old_subscriber = User(username='old_subscriber', last_name="Subscriber", first_name="Old",
- email="old_subscriber@git.an",
- date_of_birth="1942-06-12",
- is_superuser=False, is_staff=False)
+ email="old_subscriber@git.an",
+ date_of_birth="1942-06-12",
+ is_superuser=False, is_staff=False)
old_subscriber.set_password("plop")
old_subscriber.save()
- old_subscriber.view_groups=[Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first().id]
+ old_subscriber.view_groups = [Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first().id]
old_subscriber.save()
# Adding user Counter admin
counter = User(username='counter', last_name="Ter", first_name="Coun",
- email="counter@git.an",
- date_of_birth="1942-06-12",
- is_superuser=False, is_staff=False)
+ email="counter@git.an",
+ date_of_birth="1942-06-12",
+ is_superuser=False, is_staff=False)
counter.set_password("plop")
counter.save()
- counter.view_groups=[Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first().id]
- counter.groups=[Group.objects.filter(id=settings.SITH_GROUP_COUNTER_ADMIN_ID).first().id]
+ counter.view_groups = [Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first().id]
+ counter.groups = [Group.objects.filter(id=settings.SITH_GROUP_COUNTER_ADMIN_ID).first().id]
counter.save()
# Adding user Comptable
comptable = User(username='comptable', last_name="Able", first_name="Compte",
- email="compta@git.an",
- date_of_birth="1942-06-12",
- is_superuser=False, is_staff=False)
+ email="compta@git.an",
+ date_of_birth="1942-06-12",
+ is_superuser=False, is_staff=False)
comptable.set_password("plop")
comptable.save()
- comptable.view_groups=[Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first().id]
- comptable.groups=[Group.objects.filter(id=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID).first().id]
+ comptable.view_groups = [Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first().id]
+ comptable.groups = [Group.objects.filter(id=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID).first().id]
comptable.save()
# Adding user Guy
u = User(username='guy', last_name="Carlier", first_name="Guy",
@@ -221,7 +221,7 @@ Welcome to the wiki page!
is_superuser=False, is_staff=False)
u.set_password("plop")
u.save()
- u.view_groups=[Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first().id]
+ u.view_groups = [Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first().id]
u.save()
# Adding user Richard Batsbak
r = User(username='rbatsbak', last_name="Batsbak", first_name="Richard",
@@ -229,18 +229,18 @@ Welcome to the wiki page!
date_of_birth="1982-06-12")
r.set_password("plop")
r.save()
- r.view_groups=[Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first().id]
+ r.view_groups = [Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first().id]
r.save()
# Adding syntax help page
p = Page(name='Aide_sur_la_syntaxe')
p.save(force_lock=True)
- with open(os.path.join(root_path)+'/doc/SYNTAX.md', 'r') as rm:
+ with open(os.path.join(root_path) + '/doc/SYNTAX.md', 'r') as rm:
PageRev(page=p, title="Aide sur la syntaxe", author=skia, content=rm.read()).save()
- p.view_groups=[settings.SITH_GROUP_PUBLIC_ID]
+ p.view_groups = [settings.SITH_GROUP_PUBLIC_ID]
p.save(force_lock=True)
p = Page(name='Services')
p.save(force_lock=True)
- p.view_groups=[settings.SITH_GROUP_PUBLIC_ID]
+ p.view_groups = [settings.SITH_GROUP_PUBLIC_ID]
p.save(force_lock=True)
PageRev(page=p, title="Services", author=skia, content="""
| | | |
@@ -252,83 +252,83 @@ Welcome to the wiki page!
# Adding README
p = Page(name='README')
p.save(force_lock=True)
- p.view_groups=[settings.SITH_GROUP_PUBLIC_ID]
+ p.view_groups = [settings.SITH_GROUP_PUBLIC_ID]
p.save(force_lock=True)
- with open(os.path.join(root_path)+'/README.md', 'r') as rm:
+ with open(os.path.join(root_path) + '/README.md', 'r') as rm:
PageRev(page=p, title="README", author=skia, content=rm.read()).save()
# Subscription
- ## Root
+ # Root
s = Subscription(member=User.objects.filter(pk=root.pk).first(), subscription_type=list(settings.SITH_SUBSCRIPTIONS.keys())[0],
- payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0])
+ payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0])
s.subscription_start = s.compute_start()
s.subscription_end = s.compute_end(
- duration=settings.SITH_SUBSCRIPTIONS[s.subscription_type]['duration'],
- start=s.subscription_start)
+ duration=settings.SITH_SUBSCRIPTIONS[s.subscription_type]['duration'],
+ start=s.subscription_start)
s.save()
- ## Skia
+ # Skia
s = Subscription(member=User.objects.filter(pk=skia.pk).first(), subscription_type=list(settings.SITH_SUBSCRIPTIONS.keys())[0],
- payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0])
+ payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0])
s.subscription_start = s.compute_start()
s.subscription_end = s.compute_end(
- duration=settings.SITH_SUBSCRIPTIONS[s.subscription_type]['duration'],
- start=s.subscription_start)
+ duration=settings.SITH_SUBSCRIPTIONS[s.subscription_type]['duration'],
+ start=s.subscription_start)
s.save()
- ## Counter admin
+ # Counter admin
s = Subscription(member=User.objects.filter(pk=counter.pk).first(), subscription_type=list(settings.SITH_SUBSCRIPTIONS.keys())[0],
- payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0])
+ payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0])
s.subscription_start = s.compute_start()
s.subscription_end = s.compute_end(
- duration=settings.SITH_SUBSCRIPTIONS[s.subscription_type]['duration'],
- start=s.subscription_start)
+ duration=settings.SITH_SUBSCRIPTIONS[s.subscription_type]['duration'],
+ start=s.subscription_start)
s.save()
- ## Comptable
+ # Comptable
s = Subscription(member=User.objects.filter(pk=comptable.pk).first(), subscription_type=list(settings.SITH_SUBSCRIPTIONS.keys())[0],
- payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0])
+ payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0])
s.subscription_start = s.compute_start()
s.subscription_end = s.compute_end(
- duration=settings.SITH_SUBSCRIPTIONS[s.subscription_type]['duration'],
- start=s.subscription_start)
+ duration=settings.SITH_SUBSCRIPTIONS[s.subscription_type]['duration'],
+ start=s.subscription_start)
s.save()
- ## Richard
+ # Richard
s = Subscription(member=User.objects.filter(pk=r.pk).first(), subscription_type=list(settings.SITH_SUBSCRIPTIONS.keys())[0],
- payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0])
+ payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0])
s.subscription_start = s.compute_start()
s.subscription_end = s.compute_end(
- duration=settings.SITH_SUBSCRIPTIONS[s.subscription_type]['duration'],
- start=s.subscription_start)
+ duration=settings.SITH_SUBSCRIPTIONS[s.subscription_type]['duration'],
+ start=s.subscription_start)
s.save()
- ## User
+ # User
s = Subscription(member=User.objects.filter(pk=subscriber.pk).first(), subscription_type=list(settings.SITH_SUBSCRIPTIONS.keys())[0],
- payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0])
+ payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0])
s.subscription_start = s.compute_start()
s.subscription_end = s.compute_end(
- duration=settings.SITH_SUBSCRIPTIONS[s.subscription_type]['duration'],
- start=s.subscription_start)
+ duration=settings.SITH_SUBSCRIPTIONS[s.subscription_type]['duration'],
+ start=s.subscription_start)
s.save()
- ## Old subscriber
+ # Old subscriber
s = Subscription(member=User.objects.filter(pk=old_subscriber.pk).first(), subscription_type=list(settings.SITH_SUBSCRIPTIONS.keys())[0],
- payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0])
+ payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0])
s.subscription_start = s.compute_start(datetime(year=2012, month=9, day=4))
s.subscription_end = s.compute_end(
- duration=settings.SITH_SUBSCRIPTIONS[s.subscription_type]['duration'],
- start=s.subscription_start)
+ duration=settings.SITH_SUBSCRIPTIONS[s.subscription_type]['duration'],
+ start=s.subscription_start)
s.save()
# Clubs
Club(name="Bibo'UT", unix_name="bibout",
- address="46 de la Boustifaille", parent=main_club).save()
+ address="46 de la Boustifaille", parent=main_club).save()
guyut = Club(name="Guy'UT", unix_name="guyut",
- address="42 de la Boustifaille", parent=main_club)
+ address="42 de la Boustifaille", parent=main_club)
guyut.save()
Club(name="Woenzel'UT", unix_name="woenzel",
- address="Woenzel", parent=guyut).save()
+ address="Woenzel", parent=guyut).save()
Membership(user=skia, club=main_club, role=3, description="").save()
troll = Club(name="Troll Penché", unix_name="troll",
- address="Terre Du Milieu", parent=main_club)
+ address="Terre Du Milieu", parent=main_club)
troll.save()
refound = Club(name="Carte AE", unix_name="carte_ae",
- address="Jamais imprimée", parent=main_club)
+ address="Jamais imprimée", parent=main_club)
refound.save()
# Counters
@@ -341,19 +341,19 @@ Welcome to the wiki page!
r = ProductType(name="Rechargements")
r.save()
cotis = Product(name="Cotis 1 semestre", code="1SCOTIZ", product_type=c, purchase_price="15", selling_price="15",
- special_selling_price="15", club=main_club)
+ special_selling_price="15", club=main_club)
cotis.save()
cotis2 = Product(name="Cotis 2 semestres", code="2SCOTIZ", product_type=c, purchase_price="28", selling_price="28",
- special_selling_price="28", club=main_club)
+ special_selling_price="28", club=main_club)
cotis2.save()
refill = Product(name="Rechargement 15 €", code="15REFILL", product_type=r, purchase_price="15", selling_price="15",
- special_selling_price="15", club=main_club)
+ special_selling_price="15", club=main_club)
refill.save()
barb = Product(name="Barbar", code="BARB", product_type=p, purchase_price="1.50", selling_price="1.7",
- special_selling_price="1.6", club=main_club)
+ special_selling_price="1.6", club=main_club)
barb.save()
cble = Product(name="Chimay Bleue", code="CBLE", product_type=p, purchase_price="1.50", selling_price="1.7",
- special_selling_price="1.6", club=main_club)
+ special_selling_price="1.6", club=main_club)
cble.save()
Product(name="Corsendonk", code="CORS", product_type=p, purchase_price="1.50", selling_price="1.7",
special_selling_price="1.6", club=main_club).save()
@@ -375,7 +375,7 @@ Welcome to the wiki page!
refound_counter = Counter(name="Carte AE", club=refound, type='OFFICE')
refound_counter.save()
refound_product = Product(name="remboursement", code="REMBOURS", purchase_price="0", selling_price="0",
- special_selling_price="0", club=refound)
+ special_selling_price="0", club=refound)
refound_product.save()
# Accounting test values:
@@ -397,28 +397,28 @@ Welcome to the wiki page!
buying.save()
comptes = AccountingType(code='6', label="Comptes de charge", movement_type='DEBIT')
comptes.save()
- simple = SimplifiedAccountingType(label = 'Je fais du simple 6', accounting_type = comptes, movement_type='DEBIT')
+ simple = SimplifiedAccountingType(label='Je fais du simple 6', accounting_type=comptes, movement_type='DEBIT')
simple.save()
woenzco = Company(name="Woenzel & co")
woenzco.save()
operation_list = [
- (27, "J'avais trop de bière", 'CASH', None, buying, 'USER', skia.id, "", None),
- (4000, "Ceci n'est pas une opération... en fait si mais non", 'CHECK', None, debit,'COMPANY', woenzco.id, "", 23),
- (22, "C'est de l'argent ?", 'CARD', None, credit, 'CLUB', troll.id, "", None),
- (37, "Je paye CASH", 'CASH', None, debit2, 'OTHER', None, "tous les étudiants <3", None),
- (300, "Paiement Guy", 'CASH', None, buying, 'USER', skia.id, "", None),
- (32.3, "Essence", 'CASH', None, buying, 'OTHER', None, "station", None),
- (46.42, "Allumette", 'CHECK', None, credit, 'CLUB', main_club.id, "", 57),
- (666.42, "Subvention de far far away", 'CASH', None, comptes, 'CLUB', main_club.id, "", None),
- (496, "Ça, c'est un 6", 'CARD', simple, None, 'USER', skia.id, "", None),
- (17, "La Gargotte du Korrigan", 'CASH', None, debit2, 'CLUB', bar_club.id, "", None),
- ]
+ (27, "J'avais trop de bière", 'CASH', None, buying, 'USER', skia.id, "", None),
+ (4000, "Ceci n'est pas une opération... en fait si mais non", 'CHECK', None, debit, 'COMPANY', woenzco.id, "", 23),
+ (22, "C'est de l'argent ?", 'CARD', None, credit, 'CLUB', troll.id, "", None),
+ (37, "Je paye CASH", 'CASH', None, debit2, 'OTHER', None, "tous les étudiants <3", None),
+ (300, "Paiement Guy", 'CASH', None, buying, 'USER', skia.id, "", None),
+ (32.3, "Essence", 'CASH', None, buying, 'OTHER', None, "station", None),
+ (46.42, "Allumette", 'CHECK', None, credit, 'CLUB', main_club.id, "", 57),
+ (666.42, "Subvention de far far away", 'CASH', None, comptes, 'CLUB', main_club.id, "", None),
+ (496, "Ça, c'est un 6", 'CARD', simple, None, 'USER', skia.id, "", None),
+ (17, "La Gargotte du Korrigan", 'CASH', None, debit2, 'CLUB', bar_club.id, "", None),
+ ]
for op in operation_list:
operation = Operation(journal=gj, date=date.today(), amount=op[0],
- remark=op[1], mode=op[2], done=True, simpleaccounting_type=op[3],
- accounting_type=op[4], target_type=op[5], target_id=op[6],
- target_label=op[7], cheque_number=op[8])
+ remark=op[1], mode=op[2], done=True, simpleaccounting_type=op[3],
+ accounting_type=op[4], target_type=op[5], target_id=op[6],
+ target_label=op[7], cheque_number=op[8])
operation.clean()
operation.save()
@@ -428,14 +428,14 @@ Welcome to the wiki page!
date_of_birth="1942-06-12")
sli.set_password("plop")
sli.save()
- sli.view_groups=[Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first().id]
+ sli.view_groups = [Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first().id]
sli.save()
sli_profile_path = os.path.join(root_path, 'core/fixtures/images/5.jpg')
with open(sli_profile_path, 'rb') as f:
name = str(sli.id) + "_profile.jpg"
sli_profile = SithFile(parent=profiles_root, name=name,
- file=resize_image(Image.open(BytesIO(f.read())), 400, 'JPEG'),
- owner=sli, is_folder=False, mime_type='image/jpeg', size=os.path.getsize(sli_profile_path))
+ file=resize_image(Image.open(BytesIO(f.read())), 400, 'JPEG'),
+ owner=sli, is_folder=False, mime_type='image/jpeg', size=os.path.getsize(sli_profile_path))
sli_profile.file.name = name
sli_profile.save()
sli.profile_pict = sli_profile
@@ -450,27 +450,27 @@ Welcome to the wiki page!
with open(krophil_profile_path, 'rb') as f:
name = str(krophil.id) + "_profile.jpg"
krophil_profile = SithFile(parent=profiles_root, name=name,
- file=resize_image(Image.open(BytesIO(f.read())), 400, 'JPEG'),
- owner=krophil, is_folder=False, mime_type='image/jpeg', size=os.path.getsize(krophil_profile_path))
+ file=resize_image(Image.open(BytesIO(f.read())), 400, 'JPEG'),
+ owner=krophil, is_folder=False, mime_type='image/jpeg', size=os.path.getsize(krophil_profile_path))
krophil_profile.file.name = name
krophil_profile.save()
krophil.profile_pict = krophil_profile
krophil.save()
- ## Adding subscription for sli
+ # Adding subscription for sli
s = Subscription(member=User.objects.filter(pk=sli.pk).first(), subscription_type=list(settings.SITH_SUBSCRIPTIONS.keys())[0],
- payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0])
+ payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0])
s.subscription_start = s.compute_start()
s.subscription_end = s.compute_end(
- duration=settings.SITH_SUBSCRIPTIONS[s.subscription_type]['duration'],
- start=s.subscription_start)
+ duration=settings.SITH_SUBSCRIPTIONS[s.subscription_type]['duration'],
+ start=s.subscription_start)
s.save()
- ## Adding subscription for Krophil
+ # Adding subscription for Krophil
s = Subscription(member=User.objects.filter(pk=krophil.pk).first(), subscription_type=list(settings.SITH_SUBSCRIPTIONS.keys())[0],
- payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0])
+ payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0])
s.subscription_start = s.compute_start()
s.subscription_end = s.compute_end(
- duration=settings.SITH_SUBSCRIPTIONS[s.subscription_type]['duration'],
- start=s.subscription_start)
+ duration=settings.SITH_SUBSCRIPTIONS[s.subscription_type]['duration'],
+ start=s.subscription_start)
s.save()
# Add barman to counter
@@ -483,8 +483,8 @@ Welcome to the wiki page!
subscriber_group = Group.objects.get(name=settings.SITH_MAIN_MEMBERS_GROUP)
ae_board_group = Group.objects.get(name=settings.SITH_MAIN_BOARD_GROUP)
el = Election(title="Élection 2017", description="La roue tourne", start_candidature='1942-06-12 10:28:45+01',
- end_candidature='2042-06-12 10:28:45+01',start_date='1942-06-12 10:28:45+01',
- end_date='7942-06-12 10:28:45+01')
+ end_candidature='2042-06-12 10:28:45+01', start_date='1942-06-12 10:28:45+01',
+ end_date='7942-06-12 10:28:45+01')
el.save()
el.view_groups.add(public_group)
el.edit_groups.add(ae_board_group)
@@ -519,4 +519,3 @@ Welcome to the wiki page!
various.save()
Forum(name="Promos", description="Réservé aux Promos", parent=various).save()
ForumTopic(forum=hall)
-
diff --git a/core/management/commands/setup.py b/core/management/commands/setup.py
index eed57896..88be8377 100644
--- a/core/management/commands/setup.py
+++ b/core/management/commands/setup.py
@@ -23,9 +23,8 @@
#
import os
-from django.core.management.base import BaseCommand, CommandError
+from django.core.management.base import BaseCommand
from django.core.management import call_command
-from django.conf import settings
class Command(BaseCommand):
@@ -37,7 +36,7 @@ class Command(BaseCommand):
def handle(self, *args, **options):
root_path = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
try:
- os.mkdir(os.path.join(root_path)+'/data')
+ os.mkdir(os.path.join(root_path) + '/data')
print("Data dir created")
except Exception as e:
repr(e)
diff --git a/core/markdown.py b/core/markdown.py
index cd631d01..991ab439 100644
--- a/core/markdown.py
+++ b/core/markdown.py
@@ -24,7 +24,7 @@
import re
from mistune import Renderer, InlineGrammar, InlineLexer, Markdown, escape, escape_link
-from django.core.urlresolvers import reverse_lazy, reverse
+from django.core.urlresolvers import reverse
class SithRenderer(Renderer):
@@ -54,13 +54,16 @@ class SithRenderer(Renderer):
src = original_src
else:
width = m.group(1)
- if not width.endswith('%'): width += "px"
+ if not width.endswith('%'):
+ width += "px"
style = "width: %s; " % width
try:
height = m.group(3)
- if not height.endswith('%'): height += "px"
+ if not height.endswith('%'):
+ height += "px"
style += "height: %s; " % height
- except: pass
+ except:
+ pass
else:
params = None
src = original_src
@@ -77,6 +80,7 @@ class SithRenderer(Renderer):
return '%s />' % html
return '%s>' % html
+
class SithInlineGrammar(InlineGrammar):
double_emphasis = re.compile(
r'^\*{2}([\s\S]+?)\*{2}(?!\*)' # **word**
@@ -94,6 +98,7 @@ class SithInlineGrammar(InlineGrammar):
r'^([\s\S]+?)' # text
)
+
class SithInlineLexer(InlineLexer):
grammar_class = SithInlineGrammar
@@ -159,15 +164,16 @@ class SithInlineLexer(InlineLexer):
return self.renderer.emphasis(text)
def _process_link(self, m, link, title=None):
- try: # Add page:// support for links
+ try: # Add page:// support for links
page = re.compile(
r'^page://(\S*)' # page://nom_de_ma_page
)
match = page.search(link)
page = match.group(1) or ""
link = reverse('core:page', kwargs={'page_name': page})
- except: pass
- try: # Add file:// support for links
+ except:
+ pass
+ try: # Add file:// support for links
file_link = re.compile(
r'^file://(\d*)/?(\S*)?' # file://4000/download
)
@@ -175,9 +181,11 @@ class SithInlineLexer(InlineLexer):
id = match.group(1)
suffix = match.group(2) or ""
link = reverse('core:file_detail', kwargs={'file_id': id}) + suffix
- except: pass
+ except:
+ pass
return super(SithInlineLexer, self)._process_link(m, link, title)
+
renderer = SithRenderer(escape=True)
inline = SithInlineLexer(renderer)
@@ -222,4 +230,3 @@ Petit *test* _sur_ ^une^ **seule** ^ligne pour voir^
"""
print(markdown(text))
-
diff --git a/core/middleware.py b/core/middleware.py
index 09cb9b0a..36c91bbf 100644
--- a/core/middleware.py
+++ b/core/middleware.py
@@ -52,4 +52,3 @@ class AuthenticationMiddleware(DjangoAuthenticationMiddleware):
"'account.middleware.AuthenticationMiddleware'."
)
request.user = SimpleLazyObject(lambda: get_cached_user(request))
-
diff --git a/core/models.py b/core/models.py
index 0e747a4f..a0791c1b 100644
--- a/core/models.py
+++ b/core/models.py
@@ -44,14 +44,17 @@ from datetime import datetime, timedelta, date
import unicodedata
+
class RealGroupManager(AuthGroupManager):
def get_queryset(self):
return super(RealGroupManager, self).get_queryset().filter(is_meta=False)
+
class MetaGroupManager(AuthGroupManager):
def get_queryset(self):
return super(MetaGroupManager, self).get_queryset().filter(is_meta=True)
+
class Group(AuthGroup):
is_meta = models.BooleanField(
_('meta group status'),
@@ -69,8 +72,10 @@ class Group(AuthGroup):
"""
return reverse('core:group_list')
+
class MetaGroup(Group):
objects = MetaGroupManager()
+
class Meta:
proxy = True
@@ -78,20 +83,24 @@ class MetaGroup(Group):
super(MetaGroup, self).__init__(*args, **kwargs)
self.is_meta = True
+
class RealGroup(Group):
objects = RealGroupManager()
+
class Meta:
proxy = True
+
def validate_promo(value):
start_year = settings.SITH_SCHOOL_START_YEAR
- delta = (date.today()+timedelta(days=180)).year - start_year
+ delta = (date.today() + timedelta(days=180)).year - start_year
if value < 0 or delta < value:
raise ValidationError(
_('%(value)s is not a valid promo (between 0 and %(end)s)'),
params={'value': value, 'end': delta},
)
+
class User(AbstractBaseUser):
"""
Defines the base user class, useable in every app
@@ -148,13 +157,13 @@ class User(AbstractBaseUser):
)
groups = models.ManyToManyField(RealGroup, related_name='users', blank=True)
home = models.OneToOneField('SithFile', related_name='home_of', verbose_name=_("home"), null=True, blank=True,
- on_delete=models.SET_NULL)
+ on_delete=models.SET_NULL)
profile_pict = models.OneToOneField('SithFile', related_name='profile_of', verbose_name=_("profile"), null=True,
- blank=True, on_delete=models.SET_NULL)
+ blank=True, on_delete=models.SET_NULL)
avatar_pict = models.OneToOneField('SithFile', related_name='avatar_of', verbose_name=_("avatar"), null=True,
- blank=True, on_delete=models.SET_NULL)
+ blank=True, on_delete=models.SET_NULL)
scrub_pict = models.OneToOneField('SithFile', related_name='scrub_of', verbose_name=_("scrub"), null=True,
- blank=True, on_delete=models.SET_NULL)
+ blank=True, on_delete=models.SET_NULL)
sex = models.CharField(_("sex"), max_length=10, choices=[("MAN", _("Man")), ("WOMAN", _("Woman"))], default="MAN")
tshirt_size = models.CharField(_("tshirt size"), max_length=5, choices=[
("-", _("-")),
@@ -165,7 +174,7 @@ class User(AbstractBaseUser):
("XL", _("XL")),
("XXL", _("XXL")),
("XXXL", _("XXXL")),
- ], default="-")
+ ], default="-")
role = models.CharField(_("role"), max_length=15, choices=[
("STUDENT", _("Student")),
("ADMINISTRATIVE", _("Administrative agent")),
@@ -174,9 +183,9 @@ class User(AbstractBaseUser):
("DOCTOR", _("Doctor")),
("FORMER STUDENT", _("Former student")),
("SERVICE", _("Service")),
- ], blank=True, default="")
+ ], blank=True, default="")
department = models.CharField(_("department"), max_length=15, choices=settings.SITH_PROFILE_DEPARTMENTS,
- default="NA", blank=True)
+ default="NA", blank=True)
dpt_option = models.CharField(_("dpt option"), max_length=32, blank=True, default="")
semester = models.CharField(_("semester"), max_length=5, blank=True, default="")
quote = models.CharField(_("quote"), max_length=256, blank=True, default="")
@@ -226,11 +235,12 @@ class User(AbstractBaseUser):
_club_memberships = {}
_group_names = {}
_group_ids = {}
+
def is_in_group(self, group_name):
"""If the user is in the group passed in argument (as string or by id)"""
group_id = 0
g = None
- if isinstance(group_name, int): # Handle the case where group_name is an ID
+ if isinstance(group_name, int): # Handle the case where group_name is an ID
if group_name in User._group_ids.keys():
g = User._group_ids[group_name]
else:
@@ -253,7 +263,7 @@ class User(AbstractBaseUser):
return self.is_subscribed
if group_id == settings.SITH_GROUP_OLD_SUBSCRIBERS_ID:
return self.was_subscribed
- if group_name == settings.SITH_MAIN_MEMBERS_GROUP: # We check the subscription if asked
+ if group_name == settings.SITH_MAIN_MEMBERS_GROUP: # We check the subscription if asked
return self.is_subscribed
if group_name[-len(settings.SITH_BOARD_SUFFIX):] == settings.SITH_BOARD_SUFFIX:
name = group_name[:-len(settings.SITH_BOARD_SUFFIX)]
@@ -315,7 +325,7 @@ class User(AbstractBaseUser):
else:
create = True
super(User, self).save(*args, **kwargs)
- if create and settings.IS_OLD_MYSQL_PRESENT: # Create user on the old site: TODO remove me!
+ if create and settings.IS_OLD_MYSQL_PRESENT: # Create user on the old site: TODO remove me!
import MySQLdb
try:
db = MySQLdb.connect(**settings.OLD_MYSQL_INFOS)
@@ -324,9 +334,9 @@ class User(AbstractBaseUser):
(%s, %s, %s, %s, %s, %s)""", (self.id, self.last_name, self.first_name, self.email, "valid", "0"))
db.commit()
except Exception as e:
- with open(settings.BASE_DIR+"/user_fail.log", "a") as f:
+ with open(settings.BASE_DIR + "/user_fail.log", "a") as f:
print("FAIL to add user %s (%s %s - %s) to old site" % (self.id, self.first_name, self.last_name,
- self.email), file=f)
+ self.email), file=f)
print("Reason: %s" % (repr(e)), file=f)
db.rollback()
@@ -401,13 +411,13 @@ class User(AbstractBaseUser):
Returns the generated username
"""
def remove_accents(data):
- return ''.join(x for x in unicodedata.normalize('NFKD', data) if \
- unicodedata.category(x)[0] == 'L').lower()
- user_name = remove_accents(self.first_name[0]+self.last_name).encode('ascii', 'ignore').decode('utf-8')
+ return ''.join(x for x in unicodedata.normalize('NFKD', data) if
+ unicodedata.category(x)[0] == 'L').lower()
+ user_name = remove_accents(self.first_name[0] + self.last_name).encode('ascii', 'ignore').decode('utf-8')
un_set = [u.username for u in User.objects.all()]
if user_name in un_set:
i = 1
- while user_name+str(i) in un_set:
+ while user_name + str(i) in un_set:
i += 1
user_name += str(i)
self.username = user_name
@@ -473,7 +483,7 @@ class User(AbstractBaseUser):
self.profile_pict.get_download_url() if self.profile_pict else staticfiles_storage.url("core/img/unknown.jpg"),
_("Profile"),
escape(self.get_display_name()),
- )
+ )
@cached_property
def subscribed(self):
@@ -489,6 +499,7 @@ class User(AbstractBaseUser):
infos.save()
return infos
+
class AnonymousUser(AuthAnonymousUser):
def __init__(self, request):
super(AnonymousUser, self).__init__()
@@ -530,7 +541,7 @@ class AnonymousUser(AuthAnonymousUser):
The anonymous user is only the public group
"""
group_id = 0
- if isinstance(group_name, int): # Handle the case where group_name is an ID
+ if isinstance(group_name, int): # Handle the case where group_name is an ID
g = Group.objects.filter(id=group_name).first()
if g:
group_name = g.name
@@ -557,6 +568,7 @@ class AnonymousUser(AuthAnonymousUser):
def get_display_name(self):
return _("Visitor")
+
class Preferences(models.Model):
user = models.OneToOneField(User, related_name="preferences")
receive_weekmail = models.BooleanField(
@@ -576,15 +588,19 @@ class Preferences(models.Model):
def get_absolute_url(self):
return self.user.get_absolute_url()
+
def get_directory(instance, filename):
return '.{0}/{1}'.format(instance.get_parent_path(), filename)
+
def get_compressed_directory(instance, filename):
return '.{0}/compressed/{1}'.format(instance.get_parent_path(), filename)
+
def get_thumbnail_directory(instance, filename):
return '.{0}/thumbnail/{1}'.format(instance.get_parent_path(), filename)
+
class SithFile(models.Model):
name = models.CharField(_('file name'), max_length=256, blank=False)
parent = models.ForeignKey('self', related_name="children", verbose_name=_("parent"), null=True, blank=True)
@@ -601,7 +617,7 @@ class SithFile(models.Model):
is_moderated = models.BooleanField(_("is moderated"), default=False)
moderator = models.ForeignKey(User, related_name="moderated_files", verbose_name=_("owner"), null=True, blank=True)
asked_for_removal = models.BooleanField(_("asked for removal"), default=False)
- is_in_sas = models.BooleanField(_("is in the SAS"), default=False) # Allows to query this flag, updated at each call to save()
+ is_in_sas = models.BooleanField(_("is in the SAS"), default=False) # Allows to query this flag, updated at each call to save()
class Meta:
verbose_name = _("file")
@@ -763,18 +779,22 @@ class SithFile(models.Model):
def __str__(self):
return self.get_parent_path() + "/" + self.name
+
class LockError(Exception):
"""There was a lock error on the object"""
pass
+
class AlreadyLocked(LockError):
"""The object is already locked"""
pass
+
class NotLocked(LockError):
"""The object is not locked"""
pass
+
class Page(models.Model):
"""
The page class to build a Wiki
@@ -787,14 +807,13 @@ class Page(models.Model):
query, but don't rely on it when playing with a Page object, use get_full_name() instead!
"""
name = models.CharField(_('page unix name'), max_length=30,
- validators=[
- validators.RegexValidator(
- r'^[A-z.+-]+$',
- _('Enter a valid page name. This value may contain only '
- 'unaccented letters, numbers ' 'and ./+/-/_ characters.')
- ),
- ],
- blank=False)
+ validators=[
+ validators.RegexValidator(
+ r'^[A-z.+-]+$',
+ _('Enter a valid page name. This value may contain only '
+ 'unaccented letters, numbers ' 'and ./+/-/_ characters.')
+ ), ],
+ blank=False)
parent = models.ForeignKey('self', related_name="children", verbose_name=_("parent"), null=True, blank=True, on_delete=models.SET_NULL)
# Attention: this field may not be valid until you call save(). It's made for fast query, but don't rely on it when
# playing with a Page object, use get_full_name() instead!
@@ -854,12 +873,13 @@ class Page(models.Model):
Performs some needed actions before and after saving a page in database
"""
locked = kwargs.pop('force_lock', False)
- if not locked: locked = self.is_locked()
+ if not locked:
+ locked = self.is_locked()
if not locked:
raise NotLocked("The page is not locked and thus can not be saved")
self.full_clean()
if not self.id:
- super(Page, self).save(*args, **kwargs) # Save a first time to correctly set _full_name
+ super(Page, self).save(*args, **kwargs) # Save a first time to correctly set _full_name
# This reset the _full_name just before saving to maintain a coherent field quicker for queries than the
# recursive method
# It also update all the children to maintain correct names
@@ -973,7 +993,7 @@ class PageRev(models.Model):
page = models.ForeignKey(Page, related_name='revisions')
class Meta:
- ordering = ['date',]
+ ordering = ['date', ]
def get_absolute_url(self):
"""
@@ -1003,6 +1023,7 @@ class PageRev(models.Model):
# Don't forget to unlock, otherwise, people will have to wait for the page's timeout
self.page.unset_lock()
+
class Notification(models.Model):
user = models.ForeignKey(User, related_name='notifications')
url = models.CharField(_("url"), max_length=255)
@@ -1015,4 +1036,3 @@ class Notification(models.Model):
if self.param:
return self.get_type_display() % self.param
return self.get_type_display()
-
diff --git a/core/templatetags/renderer.py b/core/templatetags/renderer.py
index 32e1f435..50830260 100644
--- a/core/templatetags/renderer.py
+++ b/core/templatetags/renderer.py
@@ -27,30 +27,32 @@ from django import template
from django.template.defaultfilters import stringfilter
from django.utils.safestring import mark_safe
from core.scss.processor import ScssProcessor
-from django.utils.html import escape
from core.markdown import markdown as md
register = template.Library()
+
@register.filter(is_safe=False)
@stringfilter
def markdown(text):
return mark_safe("
%s
" % md(text))
+
@register.filter()
@stringfilter
def datetime_format_python_to_PHP(python_format_string):
"""
Given a python datetime format string, attempts to convert it to the nearest PHP datetime format string possible.
"""
- python2PHP = {"%a": "D", "%a": "D", "%A": "l", "%b": "M", "%B": "F", "%c": "", "%d": "d", "%H": "H", "%I": "h", "%j": "z", "%m": "m", "%M": "i", "%p": "A", "%S": "s", "%U": "", "%w": "w", "%W": "W", "%x": "", "%X": "", "%y": "y", "%Y": "Y", "%Z": "e" }
+ python2PHP = {"%a": "D", "%a": "D", "%A": "l", "%b": "M", "%B": "F", "%c": "", "%d": "d", "%H": "H", "%I": "h", "%j": "z", "%m": "m", "%M": "i", "%p": "A", "%S": "s", "%U": "", "%w": "w", "%W": "W", "%x": "", "%X": "", "%y": "y", "%Y": "Y", "%Z": "e"}
php_format_string = python_format_string
for py, php in python2PHP.items():
php_format_string = php_format_string.replace(py, php)
return php_format_string
+
@register.simple_tag()
def scss(path):
"""
diff --git a/core/tests.py b/core/tests.py
index 41d5eabe..86520153 100644
--- a/core/tests.py
+++ b/core/tests.py
@@ -24,7 +24,6 @@
from django.test import Client, TestCase
from django.core.urlresolvers import reverse
-from django.contrib.auth.models import Group
from django.core.management import call_command
from core.models import User, Group, Page
@@ -34,6 +33,7 @@ to run these tests :
python3 manage.py test
"""
+
class UserRegistrationTest(TestCase):
def setUp(self):
try:
@@ -52,7 +52,7 @@ class UserRegistrationTest(TestCase):
'date_of_birth': '12/6/1942',
'password1': 'plop',
'password2': 'plop',
- })
+ })
self.assertTrue(response.status_code == 200)
self.assertTrue('TEST_REGISTER_USER_FORM_OK' in str(response.content))
@@ -67,7 +67,7 @@ class UserRegistrationTest(TestCase):
'date_of_birth': '12/6/1942',
'password1': 'plop',
'password2': 'plop2',
- })
+ })
self.assertTrue(response.status_code == 200)
self.assertTrue('TEST_REGISTER_USER_FORM_FAIL' in str(response.content))
@@ -82,7 +82,7 @@ class UserRegistrationTest(TestCase):
'date_of_birth': '12/6/1942',
'password1': 'plop',
'password2': 'plop',
- })
+ })
self.assertTrue(response.status_code == 200)
self.assertTrue('TEST_REGISTER_USER_FORM_FAIL' in str(response.content))
@@ -97,7 +97,7 @@ class UserRegistrationTest(TestCase):
'date_of_birth': '12/6/1942',
'password1': 'plop',
'password2': 'plop',
- })
+ })
self.assertTrue(response.status_code == 200)
self.assertTrue('TEST_REGISTER_USER_FORM_FAIL' in str(response.content))
@@ -112,7 +112,7 @@ class UserRegistrationTest(TestCase):
'date_of_birth': '',
'password1': 'plop',
'password2': 'plop',
- })
+ })
self.assertTrue(response.status_code == 200)
self.assertTrue('TEST_REGISTER_USER_FORM_FAIL' in str(response.content))
@@ -127,7 +127,7 @@ class UserRegistrationTest(TestCase):
'date_of_birth': '12/6/1942',
'password1': 'plop',
'password2': 'plop',
- })
+ })
self.assertTrue(response.status_code == 200)
self.assertTrue('TEST_REGISTER_USER_FORM_FAIL' in str(response.content))
@@ -142,14 +142,14 @@ class UserRegistrationTest(TestCase):
'date_of_birth': '12/6/1942',
'password1': 'plop',
'password2': 'plop',
- })
+ })
response = c.post(reverse('core:register'), {'first_name': 'Bibou',
'last_name': 'Carlier',
'email': 'bibou@git.an',
'date_of_birth': '12/6/1942',
'password1': 'plop',
'password2': 'plop',
- })
+ })
self.assertTrue(response.status_code == 200)
self.assertTrue('TEST_REGISTER_USER_FORM_FAIL' in str(response.content))
@@ -164,7 +164,7 @@ class UserRegistrationTest(TestCase):
'date_of_birth': '12/6/1942',
'password1': 'plop',
'password2': 'plop',
- })
+ })
response = c.post(reverse('core:login'), {'username': 'gcarlier', 'password': 'plop'})
self.assertTrue(response.status_code == 302)
#self.assertTrue('Hello, world' in str(response.content))
@@ -180,11 +180,12 @@ class UserRegistrationTest(TestCase):
'date_of_birth': '12/6/1942',
'password1': 'plop',
'password2': 'plop',
- })
+ })
response = c.post(reverse('core:login'), {'username': 'gcarlier', 'password': 'guy'})
self.assertTrue(response.status_code == 200)
self.assertTrue("""Votre nom d\\'utilisateur et votre mot de passe ne correspondent pas. Merci de r\\xc3\\xa9essayer.
""" in str(response.content))
+
class PageHandlingTest(TestCase):
def setUp(self):
try:
@@ -207,7 +208,7 @@ class PageHandlingTest(TestCase):
'parent': '',
'name': 'guy',
'owner_group': 1,
- })
+ })
response = self.client.get(reverse('core:page', kwargs={'page_name': 'guy'}))
self.assertTrue(response.status_code == 200)
self.assertTrue('' in str(response.content))
@@ -220,12 +221,12 @@ class PageHandlingTest(TestCase):
'parent': '',
'name': 'guy',
'owner_group': '1',
- })
+ })
response = self.client.post(reverse('core:page_new'), {
'parent': '1',
'name': 'bibou',
'owner_group': '1',
- })
+ })
response = self.client.get(reverse('core:page', kwargs={'page_name': 'guy/bibou'}))
self.assertTrue(response.status_code == 200)
self.assertTrue('' in str(response.content))
@@ -259,11 +260,11 @@ class PageHandlingTest(TestCase):
'parent': '',
'name': 'guy',
'owner_group': '1',
- })
- r = self.client.post(reverse('core:page_edit', kwargs={'page_name': 'guy'}), {
- 'title': 'Bibou',
- 'content':
- '''Guy *bibou*
+ })
+ self.client.post(reverse('core:page_edit', kwargs={'page_name': 'guy'}), {
+ 'title': 'Bibou',
+ 'content':
+ '''Guy *bibou*
http://git.an
@@ -273,18 +274,19 @@ http://git.an
''',
- })
+ })
response = self.client.get(reverse('core:page', kwargs={'page_name': 'guy'}))
self.assertTrue(response.status_code == 200)
self.assertTrue('Guy bibou
\\nhttp://git.an
\\n' +
- 'Swag
\\n<guy>Bibou</guy>' +
- "<script>alert(\\'Guy\\');</script>" in str(response.content))
+ 'Swag
\\n<guy>Bibou</guy>' +
+ "<script>alert(\\'Guy\\');</script>" in str(response.content))
-#TODO: many tests on the pages:
+# TODO: many tests on the pages:
# - renaming a page
# - changing a page's parent --> check that page's children's full_name
# - changing the different groups of the page
+
class FileHandlingTest(TestCase):
def setUp(self):
try:
@@ -295,19 +297,18 @@ class FileHandlingTest(TestCase):
print(e)
def test_create_folder_home(self):
- response = self.client.post(reverse("core:file_detail", kwargs={"file_id":self.subscriber.home.id}),
- {"folder_name": "GUY_folder_test"})
+ response = self.client.post(reverse("core:file_detail", kwargs={"file_id": self.subscriber.home.id}),
+ {"folder_name": "GUY_folder_test"})
self.assertTrue(response.status_code == 302)
- response = self.client.get(reverse("core:file_detail", kwargs={"file_id":self.subscriber.home.id}))
+ response = self.client.get(reverse("core:file_detail", kwargs={"file_id": self.subscriber.home.id}))
self.assertTrue(response.status_code == 200)
self.assertTrue("GUY_folder_test" in str(response.content))
def test_upload_file_home(self):
with open("/bin/ls", "rb") as f:
- response = self.client.post(reverse("core:file_detail", kwargs={"file_id":self.subscriber.home.id}),
- {"file_field": f})
+ response = self.client.post(reverse("core:file_detail", kwargs={"file_id": self.subscriber.home.id}),
+ {"file_field": f})
self.assertTrue(response.status_code == 302)
- response = self.client.get(reverse("core:file_detail", kwargs={"file_id":self.subscriber.home.id}))
+ response = self.client.get(reverse("core:file_detail", kwargs={"file_id": self.subscriber.home.id}))
self.assertTrue(response.status_code == 200)
self.assertTrue("ls" in str(response.content))
-
diff --git a/core/urls.py b/core/urls.py
index 71d3ab01..9242eee5 100644
--- a/core/urls.py
+++ b/core/urls.py
@@ -22,7 +22,7 @@
#
#
-from django.conf.urls import url, include
+from django.conf.urls import url
from core.views import *
diff --git a/core/utils.py b/core/utils.py
index 3c31bdf5..f375a522 100644
--- a/core/utils.py
+++ b/core/utils.py
@@ -27,9 +27,10 @@ import re
# Image utils
from io import BytesIO
-from datetime import datetime, timezone, date
+from datetime import date
-from PIL import Image, ExifTags
+from PIL import ExifTags
+# from exceptions import IOError
import PIL
from django.conf import settings
@@ -49,16 +50,17 @@ def get_start_of_semester(d=date.today()):
today = d
year = today.year
start = date(year, settings.SITH_START_DATE[0], settings.SITH_START_DATE[1])
- start2 = start.replace(month=(start.month+6)%12)
+ start2 = start.replace(month=(start.month + 6) % 12)
if start > start2:
start, start2 = start2, start
if today < start:
- return start2.replace(year=year-1)
+ return start2.replace(year=year - 1)
elif today < start2:
return start
else:
return start2
+
def get_semester(d=date.today()):
start = get_start_of_semester(d)
if start.month <= 6:
@@ -66,6 +68,7 @@ def get_semester(d=date.today()):
else:
return "A" + str(start.year)[-2:]
+
def scale_dimension(width, height, long_edge):
if width > height:
ratio = long_edge * 1. / width
@@ -73,6 +76,7 @@ def scale_dimension(width, height, long_edge):
ratio = long_edge * 1. / height
return int(width * ratio), int(height * ratio)
+
def resize_image(im, edge, format):
(w, h) = im.size
(width, height) = scale_dimension(w, h, long_edge=edge)
@@ -85,28 +89,31 @@ def resize_image(im, edge, format):
im.save(fp=content, format=format.upper(), quality=90, optimize=True, progressive=True)
return ContentFile(content.getvalue())
-def exif_auto_rotate(image):
- for orientation in ExifTags.TAGS.keys() :
- if ExifTags.TAGS[orientation]=='Orientation' : break
- exif=dict(image._getexif().items())
- if exif[orientation] == 3 :
- image=image.rotate(180, expand=True)
- elif exif[orientation] == 6 :
- image=image.rotate(270, expand=True)
- elif exif[orientation] == 8 :
- image=image.rotate(90, expand=True)
+def exif_auto_rotate(image):
+ for orientation in ExifTags.TAGS.keys():
+ if ExifTags.TAGS[orientation] == 'Orientation':
+ break
+ exif = dict(image._getexif().items())
+
+ if exif[orientation] == 3:
+ image = image.rotate(180, expand=True)
+ elif exif[orientation] == 6:
+ image = image.rotate(270, expand=True)
+ elif exif[orientation] == 8:
+ image = image.rotate(90, expand=True)
return image
+
def doku_to_markdown(text):
"""This is a quite correct doku translator"""
- text = re.sub(r'([^:]|^)\/\/(.*?)\/\/', r'*\2*', text) # Italic (prevents protocol:// conflict)
- text = re.sub(r'(.*?)<\/del>', r'~~\1~~', text, flags=re.DOTALL) # Strike (may be multiline)
- text = re.sub(r'(.*?)<\/sup>', r'^\1^', text) # Superscript (multiline not supported, because almost never used)
- text = re.sub(r'(.*?)<\/sub>', r'_\1_', text) # Subscript (idem)
+ text = re.sub(r'([^:]|^)\/\/(.*?)\/\/', r'*\2*', text) # Italic (prevents protocol:// conflict)
+ text = re.sub(r'(.*?)<\/del>', r'~~\1~~', text, flags=re.DOTALL) # Strike (may be multiline)
+ text = re.sub(r'(.*?)<\/sup>', r'^\1^', text) # Superscript (multiline not supported, because almost never used)
+ text = re.sub(r'(.*?)<\/sub>', r'_\1_', text) # Subscript (idem)
- text = re.sub(r'^======(.*?)======', r'#\1', text, flags=re.MULTILINE) # Titles
+ text = re.sub(r'^======(.*?)======', r'#\1', text, flags=re.MULTILINE) # Titles
text = re.sub(r'^=====(.*?)=====', r'##\1', text, flags=re.MULTILINE)
text = re.sub(r'^====(.*?)====', r'###\1', text, flags=re.MULTILINE)
text = re.sub(r'^===(.*?)===', r'####\1', text, flags=re.MULTILINE)
@@ -121,93 +128,95 @@ def doku_to_markdown(text):
text = re.sub(r'dfile://', r'file://', text)
i = 1
- for fn in re.findall(r'\(\((.*?)\)\)', text): # Footnotes
+ for fn in re.findall(r'\(\((.*?)\)\)', text): # Footnotes
text = re.sub(r'\(\((.*?)\)\)', r'[^%s]' % i, text, count=1)
text += "\n[^%s]: %s\n" % (i, fn)
i += 1
- text = re.sub(r'\\{2,}[\s]', r' \n', text) # Carriage return
+ text = re.sub(r'\\{2,}[\s]', r' \n', text) # Carriage return
- text = re.sub(r'\[\[(.*?)\|(.*?)\]\]', r'[\2](\1)', text) # Links
- text = re.sub(r'\[\[(.*?)\]\]', r'[\1](\1)', text) # Links 2
- text = re.sub(r'{{(.*?)\|(.*?)}}', r'![\2](\1 "\2")', text) # Images
- text = re.sub(r'{{(.*?)(\|(.*?))?}}', r'![\1](\1 "\1")', text) # Images 2
- text = re.sub(r'{\[(.*?)(\|(.*?))?\]}', r'[\1](\1)', text) # Video (transform to classic links, since we can't integrate them)
+ text = re.sub(r'\[\[(.*?)\|(.*?)\]\]', r'[\2](\1)', text) # Links
+ text = re.sub(r'\[\[(.*?)\]\]', r'[\1](\1)', text) # Links 2
+ text = re.sub(r'{{(.*?)\|(.*?)}}', r'![\2](\1 "\2")', text) # Images
+ text = re.sub(r'{{(.*?)(\|(.*?))?}}', r'![\1](\1 "\1")', text) # Images 2
+ text = re.sub(r'{\[(.*?)(\|(.*?))?\]}', r'[\1](\1)', text) # Video (transform to classic links, since we can't integrate them)
- text = re.sub(r'###(\d*?)###', r'[[[\1]]]', text) # Progress bar
+ text = re.sub(r'###(\d*?)###', r'[[[\1]]]', text) # Progress bar
- text = re.sub(r'(\n +[^* -][^\n]*(\n +[^* -][^\n]*)*)', r'```\1\n```', text, flags=re.DOTALL) # Block code without lists
+ text = re.sub(r'(\n +[^* -][^\n]*(\n +[^* -][^\n]*)*)', r'```\1\n```', text, flags=re.DOTALL) # Block code without lists
- text = re.sub(r'( +)-(.*)', r'1.\2', text) # Ordered lists
+ text = re.sub(r'( +)-(.*)', r'1.\2', text) # Ordered lists
new_text = []
quote_level = 0
- for line in text.splitlines(): # Tables and quotes
+ for line in text.splitlines(): # Tables and quotes
enter = re.finditer(r'\[quote(=(.+?))?\]', line)
quit = re.finditer(r'\[/quote\]', line)
- if re.search(r'\A\s*\^(([^\^]*?)\^)*', line): # Table part
+ if re.search(r'\A\s*\^(([^\^]*?)\^)*', line): # Table part
line = line.replace('^', '|')
new_text.append("> " * quote_level + line)
- new_text.append("> " * quote_level + "|---|") # Don't keep the text alignement in tables it's really too complex for what it's worth
- elif enter or quit: # Quote part
- for quote in enter: # Enter quotes (support multiple at a time)
+ new_text.append("> " * quote_level + "|---|") # Don't keep the text alignement in tables it's really too complex for what it's worth
+ elif enter or quit: # Quote part
+ for quote in enter: # Enter quotes (support multiple at a time)
quote_level += 1
try:
new_text.append("> " * quote_level + "##### " + quote.group(2))
except:
new_text.append("> " * quote_level)
line = line.replace(quote.group(0), '')
- final_quote_level = quote_level # Store quote_level to use at the end, since it will be modified during quit iteration
+ final_quote_level = quote_level # Store quote_level to use at the end, since it will be modified during quit iteration
final_newline = False
- for quote in quit: # Quit quotes (support multiple at a time)
+ for quote in quit: # Quit quotes (support multiple at a time)
line = line.replace(quote.group(0), '')
quote_level -= 1
final_newline = True
- new_text.append("> " * final_quote_level + line) # Finally append the line
- if final_newline: new_text.append("\n") # Add a new line to ensure the separation between the quote and the following text
+ new_text.append("> " * final_quote_level + line) # Finally append the line
+ if final_newline:
+ new_text.append("\n") # Add a new line to ensure the separation between the quote and the following text
else:
new_text.append(line)
return "\n".join(new_text)
+
def bbcode_to_markdown(text):
"""This is a very basic BBcode translator"""
- text = re.sub(r'\[b\](.*?)\[\/b\]', r'**\1**', text, flags=re.DOTALL) # Bold
- text = re.sub(r'\[i\](.*?)\[\/i\]', r'*\1*', text, flags=re.DOTALL) # Italic
- text = re.sub(r'\[u\](.*?)\[\/u\]', r'__\1__', text, flags=re.DOTALL) # Underline
- text = re.sub(r'\[s\](.*?)\[\/s\]', r'~~\1~~', text, flags=re.DOTALL) # Strike (may be multiline)
- text = re.sub(r'\[strike\](.*?)\[\/strike\]', r'~~\1~~', text, flags=re.DOTALL) # Strike 2
+ text = re.sub(r'\[b\](.*?)\[\/b\]', r'**\1**', text, flags=re.DOTALL) # Bold
+ text = re.sub(r'\[i\](.*?)\[\/i\]', r'*\1*', text, flags=re.DOTALL) # Italic
+ text = re.sub(r'\[u\](.*?)\[\/u\]', r'__\1__', text, flags=re.DOTALL) # Underline
+ text = re.sub(r'\[s\](.*?)\[\/s\]', r'~~\1~~', text, flags=re.DOTALL) # Strike (may be multiline)
+ text = re.sub(r'\[strike\](.*?)\[\/strike\]', r'~~\1~~', text, flags=re.DOTALL) # Strike 2
text = re.sub(r'article://', r'page://', text)
text = re.sub(r'dfile://', r'file://', text)
- text = re.sub(r'\[url=(.*?)\](.*)\[\/url\]', r'[\2](\1)', text) # Links
- text = re.sub(r'\[url\](.*)\[\/url\]', r'\1', text) # Links 2
- text = re.sub(r'\[img\](.*)\[\/img\]', r'![\1](\1 "\1")', text) # Images
+ text = re.sub(r'\[url=(.*?)\](.*)\[\/url\]', r'[\2](\1)', text) # Links
+ text = re.sub(r'\[url\](.*)\[\/url\]', r'\1', text) # Links 2
+ text = re.sub(r'\[img\](.*)\[\/img\]', r'![\1](\1 "\1")', text) # Images
new_text = []
quote_level = 0
- for line in text.splitlines(): # Tables and quotes
+ for line in text.splitlines(): # Tables and quotes
enter = re.finditer(r'\[quote(=(.+?))?\]', line)
quit = re.finditer(r'\[/quote\]', line)
- if enter or quit: # Quote part
- for quote in enter: # Enter quotes (support multiple at a time)
+ if enter or quit: # Quote part
+ for quote in enter: # Enter quotes (support multiple at a time)
quote_level += 1
try:
new_text.append("> " * quote_level + "##### " + quote.group(2))
except:
new_text.append("> " * quote_level)
line = line.replace(quote.group(0), '')
- final_quote_level = quote_level # Store quote_level to use at the end, since it will be modified during quit iteration
+ final_quote_level = quote_level # Store quote_level to use at the end, since it will be modified during quit iteration
final_newline = False
- for quote in quit: # Quit quotes (support multiple at a time)
+ for quote in quit: # Quit quotes (support multiple at a time)
line = line.replace(quote.group(0), '')
quote_level -= 1
final_newline = True
- new_text.append("> " * final_quote_level + line) # Finally append the line
- if final_newline: new_text.append("\n") # Add a new line to ensure the separation between the quote and the following text
+ new_text.append("> " * final_quote_level + line) # Finally append the line
+ if final_newline:
+ new_text.append("\n") # Add a new line to ensure the separation between the quote and the following text
else:
new_text.append(line)
return "\n".join(new_text)
-
diff --git a/core/views/files.py b/core/views/files.py
index dcde31cd..1f61189f 100644
--- a/core/views/files.py
+++ b/core/views/files.py
@@ -23,29 +23,28 @@
#
# This file contains all the views that concern the page model
-from django.shortcuts import render, redirect, get_object_or_404
+from django.shortcuts import redirect
from django.views.generic import ListView, DetailView, TemplateView
-from django.views.generic.edit import UpdateView, CreateView, FormMixin, DeleteView
+from django.views.generic.edit import UpdateView, FormMixin, DeleteView
from django.views.generic.detail import SingleObjectMixin
-from django.contrib.auth.decorators import login_required, permission_required
from django.forms.models import modelform_factory
-from django.forms import CheckboxSelectMultiple
from django.conf import settings
from django.utils.translation import ugettext_lazy as _
from django.http import HttpResponse
from django.core.servers.basehttp import FileWrapper
from django.core.urlresolvers import reverse
-from django.core.exceptions import PermissionDenied, ObjectDoesNotExist
+from django.core.exceptions import PermissionDenied
from django import forms
import os
-from ajax_select import make_ajax_form, make_ajax_field
+from ajax_select import make_ajax_field
from core.models import SithFile, RealGroup, Notification
-from core.views import CanViewMixin, CanEditMixin, CanEditPropMixin, CanCreateMixin, can_view, not_found
+from core.views import CanViewMixin, CanEditMixin, CanEditPropMixin, can_view, not_found
from counter.models import Counter
+
def send_file(request, file_id, file_class=SithFile, file_attr="file"):
"""
Send a file through Django without loading the whole file into
@@ -57,7 +56,7 @@ def send_file(request, file_id, file_class=SithFile, file_attr="file"):
return not_found(request)
if not (can_view(f, request.user) or
('counter_token' in request.session.keys() and
- request.session['counter_token'] and # check if not null for counters that have no token set
+ request.session['counter_token'] and # check if not null for counters that have no token set
Counter.objects.filter(token=request.session['counter_token']).exists())
):
raise PermissionDenied
@@ -70,10 +69,11 @@ def send_file(request, file_id, file_class=SithFile, file_attr="file"):
response['Content-Disposition'] = ('inline; filename="%s"' % f.name).encode('utf-8')
return response
+
class AddFilesForm(forms.Form):
folder_name = forms.CharField(label=_("Add a new folder"), max_length=30, required=False)
file_field = forms.FileField(widget=forms.ClearableFileInput(attrs={'multiple': True}), label=_("Files"),
- required=False)
+ required=False)
def process(self, parent, owner, files):
notif = False
@@ -85,10 +85,10 @@ class AddFilesForm(forms.Form):
notif = True
except Exception as e:
self.add_error(None, _("Error creating folder %(folder_name)s: %(msg)s") %
- {'folder_name': self.cleaned_data['folder_name'], 'msg': repr(e)})
+ {'folder_name': self.cleaned_data['folder_name'], 'msg': repr(e)})
for f in files:
new_file = SithFile(parent=parent, name=f.name, file=f, owner=owner, is_folder=False,
- mime_type=f.content_type, size=f._size)
+ mime_type=f.content_type, size=f._size)
try:
new_file.clean()
new_file.save()
@@ -100,6 +100,7 @@ class AddFilesForm(forms.Form):
if not u.notifications.filter(type="FILE_MODERATION", viewed=False).exists():
Notification(user=u, url=reverse("core:file_moderation"), type="FILE_MODERATION").save()
+
class FileListView(ListView):
template_name = 'core/file_list.jinja'
context_object_name = "file_list"
@@ -114,6 +115,7 @@ class FileListView(ListView):
kwargs['popup'] = 'popup'
return kwargs
+
class FileEditView(CanEditMixin, UpdateView):
model = SithFile
pk_url_kwarg = "file_id"
@@ -138,6 +140,7 @@ class FileEditView(CanEditMixin, UpdateView):
kwargs['popup'] = 'popup'
return kwargs
+
class FileEditPropForm(forms.ModelForm):
class Meta:
model = SithFile
@@ -147,6 +150,7 @@ class FileEditPropForm(forms.ModelForm):
view_groups = make_ajax_field(SithFile, 'view_groups', 'groups', help_text="", label=_("view group"))
recursive = forms.BooleanField(label=_("Apply rights recursively"), required=False)
+
class FileEditPropView(CanEditPropMixin, UpdateView):
model = SithFile
pk_url_kwarg = "file_id"
@@ -175,6 +179,7 @@ class FileEditPropView(CanEditPropMixin, UpdateView):
kwargs['popup'] = 'popup'
return kwargs
+
class FileView(CanViewMixin, DetailView, FormMixin):
"""This class handle the upload of new files into a folder"""
model = SithFile
@@ -217,7 +222,7 @@ class FileView(CanViewMixin, DetailView, FormMixin):
request.session['clipboard'] = []
if request.user.can_edit(self.object):
FileView.handle_clipboard(request, self.object)
- self.form = self.get_form() # The form handle only the file upload
+ self.form = self.get_form() # The form handle only the file upload
files = request.FILES.getlist('file_field')
if request.user.is_authenticated() and request.user.can_edit(self.object) and self.form.is_valid():
self.form.process(parent=self.object, owner=request.user, files=files)
@@ -237,6 +242,7 @@ class FileView(CanViewMixin, DetailView, FormMixin):
kwargs['clipboard'] = SithFile.objects.filter(id__in=self.request.session['clipboard'])
return kwargs
+
class FileDeleteView(CanEditPropMixin, DeleteView):
model = SithFile
pk_url_kwarg = "file_id"
@@ -244,7 +250,7 @@ class FileDeleteView(CanEditPropMixin, DeleteView):
context_object_name = "file"
def get_success_url(self):
- self.object.file.delete() # Doing it here or overloading delete() is the same, so let's do it here
+ self.object.file.delete() # Doing it here or overloading delete() is the same, so let's do it here
if 'next' in self.request.GET.keys():
return self.request.GET['next']
if self.object.parent is None:
@@ -258,6 +264,7 @@ class FileDeleteView(CanEditPropMixin, DeleteView):
kwargs['popup'] = 'popup'
return kwargs
+
class FileModerationView(TemplateView):
template_name = "core/file_moderation.jinja"
@@ -266,6 +273,7 @@ class FileModerationView(TemplateView):
kwargs['files'] = SithFile.objects.filter(is_moderated=False)[:100]
return kwargs
+
class FileModerateView(CanEditPropMixin, SingleObjectMixin):
model = SithFile
pk_url_kwarg = "file_id"
@@ -278,4 +286,3 @@ class FileModerateView(CanEditPropMixin, SingleObjectMixin):
if 'next' in self.request.GET.keys():
return redirect(self.request.GET['next'])
return redirect('core:file_moderation')
-
diff --git a/core/views/forms.py b/core/views/forms.py
index cab656ea..0bf40cd8 100644
--- a/core/views/forms.py
+++ b/core/views/forms.py
@@ -22,22 +22,24 @@
#
#
-from django.contrib.auth.forms import UserCreationForm, AuthenticationForm, UserChangeForm
+from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
from django import forms
from django.conf import settings
from django.db import transaction
from django.core.exceptions import ValidationError
-from django.contrib.auth import logout, login, authenticate
from django.forms import CheckboxSelectMultiple, Select, DateInput, TextInput, DateTimeInput, Textarea
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ugettext
from phonenumber_field.widgets import PhoneNumberInternationalFallbackWidget
from ajax_select.fields import AutoCompleteSelectField
-import logging
import re
-from core.models import User, Page, RealGroup, SithFile
+from core.models import User, Page, SithFile
+
+from core.utils import resize_image
+from io import BytesIO
+from PIL import Image
# Widgets
@@ -50,6 +52,7 @@ class SelectSingle(Select):
attrs = {'class': "select_single"}
return super(SelectSingle, self).render(name, value, attrs)
+
class SelectMultiple(Select):
def render(self, name, value, attrs=None):
if attrs:
@@ -58,6 +61,7 @@ class SelectMultiple(Select):
attrs = {'class': "select_multiple"}
return super(SelectMultiple, self).render(name, value, attrs)
+
class SelectDateTime(DateTimeInput):
def render(self, name, value, attrs=None):
if attrs:
@@ -66,6 +70,7 @@ class SelectDateTime(DateTimeInput):
attrs = {'class': "select_datetime"}
return super(SelectDateTime, self).render(name, value, attrs)
+
class SelectDate(DateInput):
def render(self, name, value, attrs=None):
if attrs:
@@ -74,16 +79,18 @@ class SelectDate(DateInput):
attrs = {'class': "select_date"}
return super(SelectDate, self).render(name, value, attrs)
+
class MarkdownInput(Textarea):
def render(self, name, value, attrs=None):
output = '%(help_text)s
'\
'%(content)s
' % {
- 'syntax_url': Page.get_page_by_full_name(settings.SITH_CORE_PAGE_SYNTAX).get_absolute_url(),
- 'help_text': _("Help on the syntax"),
- 'content': super(MarkdownInput, self).render(name, value, attrs),
- }
+ 'syntax_url': Page.get_page_by_full_name(settings.SITH_CORE_PAGE_SYNTAX).get_absolute_url(),
+ 'help_text': _("Help on the syntax"),
+ 'content': super(MarkdownInput, self).render(name, value, attrs),
+ }
return output
+
class SelectFile(TextInput):
def render(self, name, value, attrs=None):
if attrs:
@@ -91,13 +98,14 @@ class SelectFile(TextInput):
else:
attrs = {'class': "select_file"}
output = '%(content)s' % {
- 'content': super(SelectFile, self).render(name, value, attrs),
- 'title': _("Choose file"),
- 'name': name,
- }
+ 'content': super(SelectFile, self).render(name, value, attrs),
+ 'title': _("Choose file"),
+ 'name': name,
+ }
output += '' + ugettext("Choose file") + ''
return output
+
class SelectUser(TextInput):
def render(self, name, value, attrs=None):
if attrs:
@@ -105,15 +113,16 @@ class SelectUser(TextInput):
else:
attrs = {'class': "select_user"}
output = '%(content)s' % {
- 'content': super(SelectUser, self).render(name, value, attrs),
- 'title': _("Choose user"),
- 'name': name,
- }
+ 'content': super(SelectUser, self).render(name, value, attrs),
+ 'title': _("Choose user"),
+ 'name': name,
+ }
output += '' + ugettext("Choose user") + ''
return output
# Forms
+
class LoginForm(AuthenticationForm):
def __init__(self, *arg, **kwargs):
if 'data' in kwargs.keys():
@@ -128,14 +137,17 @@ class LoginForm(AuthenticationForm):
else:
user = User.objects.filter(username=data['username']).first()
data['username'] = user.username
- except: pass
+ except:
+ pass
kwargs['data'] = data
super(LoginForm, self).__init__(*arg, **kwargs)
self.fields['username'].label = _("Username, email, or account number")
+
class RegisteringForm(UserCreationForm):
error_css_class = 'error'
required_css_class = 'required'
+
class Meta:
model = User
fields = ('first_name', 'last_name', 'email')
@@ -148,9 +160,6 @@ class RegisteringForm(UserCreationForm):
user.save()
return user
-from core.utils import resize_image
-from io import BytesIO
-from PIL import Image
class UserProfileForm(forms.ModelForm):
"""
@@ -161,22 +170,22 @@ class UserProfileForm(forms.ModelForm):
class Meta:
model = User
fields = ['first_name', 'last_name', 'nick_name', 'email', 'date_of_birth', 'profile_pict', 'avatar_pict',
- 'scrub_pict', 'sex', 'second_email', 'address', 'parent_address', 'phone', 'parent_phone',
- 'tshirt_size', 'role', 'department', 'dpt_option', 'semester', 'quote', 'school', 'promo',
- 'forum_signature', 'is_subscriber_viewable']
+ 'scrub_pict', 'sex', 'second_email', 'address', 'parent_address', 'phone', 'parent_phone',
+ 'tshirt_size', 'role', 'department', 'dpt_option', 'semester', 'quote', 'school', 'promo',
+ 'forum_signature', 'is_subscriber_viewable']
widgets = {
- 'date_of_birth': SelectDate,
- 'profile_pict': forms.ClearableFileInput,
- 'avatar_pict': forms.ClearableFileInput,
- 'scrub_pict': forms.ClearableFileInput,
- 'phone': PhoneNumberInternationalFallbackWidget,
- 'parent_phone': PhoneNumberInternationalFallbackWidget,
- }
+ 'date_of_birth': SelectDate,
+ 'profile_pict': forms.ClearableFileInput,
+ 'avatar_pict': forms.ClearableFileInput,
+ 'scrub_pict': forms.ClearableFileInput,
+ 'phone': PhoneNumberInternationalFallbackWidget,
+ 'parent_phone': PhoneNumberInternationalFallbackWidget,
+ }
labels = {
- 'profile_pict': _("Profile: you need to be visible on the picture, in order to be recognized (e.g. by the barmen)"),
- 'avatar_pict': _("Avatar: used on the forum"),
- 'scrub_pict': _("Scrub: let other know how your scrub looks like!"),
- }
+ 'profile_pict': _("Profile: you need to be visible on the picture, in order to be recognized (e.g. by the barmen)"),
+ 'avatar_pict': _("Avatar: used on the forum"),
+ 'scrub_pict': _("Scrub: let other know how your scrub looks like!"),
+ }
def __init__(self, *arg, **kwargs):
super(UserProfileForm, self).__init__(*arg, **kwargs)
@@ -197,14 +206,14 @@ class UserProfileForm(forms.ModelForm):
self.cleaned_data['profile_pict'] = profile
self.cleaned_data['scrub_pict'] = scrub
parent = SithFile.objects.filter(parent=None, name="profiles").first()
- for field,f in files:
+ for field, f in files:
with transaction.atomic():
try:
im = Image.open(BytesIO(f.read()))
new_file = SithFile(parent=parent, name=self.generate_name(field, f),
- file=resize_image(im, 400, f.content_type.split('/')[-1]),
- owner=self.instance, is_folder=False, mime_type=f.content_type, size=f._size,
- moderator=self.instance, is_moderated=True)
+ file=resize_image(im, 400, f.content_type.split('/')[-1]),
+ owner=self.instance, is_folder=False, mime_type=f.content_type, size=f._size,
+ moderator=self.instance, is_moderated=True)
new_file.file.name = new_file.name
old = SithFile.objects.filter(parent=parent, name=new_file.name).first()
if old:
@@ -216,16 +225,18 @@ class UserProfileForm(forms.ModelForm):
except ValidationError as e:
self._errors.pop(field, None)
self.add_error(field, _("Error uploading file %(file_name)s: %(msg)s") %
- {'file_name': f, 'msg': str(e.message)})
+ {'file_name': f, 'msg': str(e.message)})
except IOError:
self._errors.pop(field, None)
self.add_error(field, _("Error uploading file %(file_name)s: %(msg)s") %
- {'file_name': f, 'msg': _("Bad image format, only jpeg, png, and gif are accepted")})
+ {'file_name': f, 'msg': _("Bad image format, only jpeg, png, and gif are accepted")})
self._post_clean()
+
class UserPropForm(forms.ModelForm):
error_css_class = 'error'
required_css_class = 'required'
+
class Meta:
model = User
fields = ['groups']
@@ -236,13 +247,16 @@ class UserPropForm(forms.ModelForm):
'groups': CheckboxSelectMultiple,
}
+
class UserGodfathersForm(forms.Form):
type = forms.ChoiceField(choices=[('godfather', _("Godfather")), ('godchild', _("Godchild"))], label=_("Add"))
user = AutoCompleteSelectField('users', required=True, label=_("Select user"), help_text=None)
+
class PagePropForm(forms.ModelForm):
error_css_class = 'error'
required_css_class = 'required'
+
class Meta:
model = Page
fields = ['parent', 'name', 'owner_group', 'edit_groups', 'view_groups', ]
@@ -255,4 +269,3 @@ class PagePropForm(forms.ModelForm):
super(PagePropForm, self).__init__(*arg, **kwargs)
self.fields['edit_groups'].required = False
self.fields['view_groups'].required = False
-
diff --git a/core/views/group.py b/core/views/group.py
index 04b9dd69..8dc54905 100644
--- a/core/views/group.py
+++ b/core/views/group.py
@@ -29,6 +29,7 @@ from django.core.urlresolvers import reverse_lazy
from core.models import RealGroup
from core.views import CanEditMixin
+
class GroupListView(CanEditMixin, ListView):
"""
Displays the group list
@@ -36,17 +37,20 @@ class GroupListView(CanEditMixin, ListView):
model = RealGroup
template_name = "core/group_list.jinja"
+
class GroupEditView(CanEditMixin, UpdateView):
model = RealGroup
pk_url_kwarg = "group_id"
template_name = "core/group_edit.jinja"
fields = ['name', 'description']
+
class GroupCreateView(CanEditMixin, CreateView):
model = RealGroup
template_name = "core/group_edit.jinja"
fields = ['name', 'description']
+
class GroupDeleteView(CanEditMixin, DeleteView):
model = RealGroup
pk_url_kwarg = "group_id"
diff --git a/core/views/page.py b/core/views/page.py
index 999f6482..9c6cfc37 100644
--- a/core/views/page.py
+++ b/core/views/page.py
@@ -23,23 +23,22 @@
#
# This file contains all the views that concern the page model
-from django.shortcuts import render, redirect, get_object_or_404
from django.core.urlresolvers import reverse_lazy
from django.views.generic import ListView, DetailView
from django.views.generic.edit import UpdateView, CreateView, DeleteView
-from django.contrib.auth.decorators import login_required, permission_required
-from django.utils.decorators import method_decorator
from django.forms.models import modelform_factory
-from django.forms import CheckboxSelectMultiple, modelform_factory
+from django.forms import CheckboxSelectMultiple
from core.models import Page, PageRev, LockError
-from core.views.forms import PagePropForm, MarkdownInput
+from core.views.forms import MarkdownInput
from core.views import CanViewMixin, CanEditMixin, CanEditPropMixin, CanCreateMixin
+
class PageListView(CanViewMixin, ListView):
model = Page
template_name = 'core/page_list.jinja'
+
class PageView(CanViewMixin, DetailView):
model = Page
template_name = 'core/page_detail.jinja'
@@ -54,6 +53,7 @@ class PageView(CanViewMixin, DetailView):
context['new_page'] = self.kwargs['page_name']
return context
+
class PageHistView(CanViewMixin, DetailView):
model = Page
template_name = 'core/page_hist.jinja'
@@ -62,6 +62,7 @@ class PageHistView(CanViewMixin, DetailView):
self.page = Page.get_page_by_full_name(self.kwargs['page_name'])
return self.page
+
class PageRevView(CanViewMixin, DetailView):
model = Page
template_name = 'core/page_detail.jinja'
@@ -78,20 +79,21 @@ class PageRevView(CanViewMixin, DetailView):
rev = self.page.revisions.get(id=self.kwargs['rev'])
context['rev'] = rev
except:
- # By passing, the template will just display the normal page without taking revision into account
+ # By passing, the template will just display the normal page without taking revision into account
pass
else:
context['new_page'] = self.kwargs['page_name']
return context
+
class PageCreateView(CanCreateMixin, CreateView):
model = Page
form_class = modelform_factory(Page,
- fields = ['parent', 'name', 'owner_group', 'edit_groups', 'view_groups', ],
- widgets={
- 'edit_groups':CheckboxSelectMultiple,
- 'view_groups':CheckboxSelectMultiple,
- })
+ fields=['parent', 'name', 'owner_group', 'edit_groups', 'view_groups', ],
+ widgets={
+ 'edit_groups': CheckboxSelectMultiple,
+ 'view_groups': CheckboxSelectMultiple,
+ })
template_name = 'core/page_prop.jinja'
def get_initial(self):
@@ -115,14 +117,15 @@ class PageCreateView(CanCreateMixin, CreateView):
ret = super(PageCreateView, self).form_valid(form)
return ret
+
class PagePropView(CanEditPropMixin, UpdateView):
model = Page
form_class = modelform_factory(Page,
- fields = ['parent', 'name', 'owner_group', 'edit_groups', 'view_groups', ],
- widgets={
- 'edit_groups':CheckboxSelectMultiple,
- 'view_groups':CheckboxSelectMultiple,
- })
+ fields=['parent', 'name', 'owner_group', 'edit_groups', 'view_groups', ],
+ widgets={
+ 'edit_groups': CheckboxSelectMultiple,
+ 'view_groups': CheckboxSelectMultiple,
+ })
template_name = 'core/page_prop.jinja'
slug_field = '_full_name'
slug_url_kwarg = 'page_name'
@@ -130,7 +133,7 @@ class PagePropView(CanEditPropMixin, UpdateView):
def get_object(self):
o = super(PagePropView, self).get_object()
# Create the page if it does not exists
- #if p == None:
+ # if p == None:
# parent_name = '/'.join(page_name.split('/')[:-1])
# name = page_name.split('/')[-1]
# if parent_name == "":
@@ -145,9 +148,10 @@ class PagePropView(CanEditPropMixin, UpdateView):
raise e
return self.page
+
class PageEditView(CanEditMixin, UpdateView):
model = PageRev
- form_class = modelform_factory(model=PageRev, fields=['title', 'content',], widgets={'content': MarkdownInput})
+ form_class = modelform_factory(model=PageRev, fields=['title', 'content', ], widgets={'content': MarkdownInput})
template_name = 'core/pagerev_edit.jinja'
def get_object(self):
diff --git a/core/views/site.py b/core/views/site.py
index e14571c7..cbb63de9 100644
--- a/core/views/site.py
+++ b/core/views/site.py
@@ -22,17 +22,13 @@
#
#
-from django.shortcuts import render, redirect, get_object_or_404
-from django.db import models
+from django.shortcuts import render, redirect
from django.http import JsonResponse
from django.core import serializers
-from django.db.models import Q
from django.contrib.auth.decorators import login_required
from django.views.generic import ListView, TemplateView
-import os
import json
-from itertools import chain
from haystack.query import SearchQuerySet
@@ -40,9 +36,11 @@ from core.models import User, Notification
from core.utils import doku_to_markdown, bbcode_to_markdown
from club.models import Club
+
def index(request, context=None):
return render(request, "core/index.jinja")
+
class NotificationList(ListView):
model = Notification
template_name = "core/notification_list.jinja"
@@ -52,6 +50,7 @@ class NotificationList(ListView):
self.request.user.notifications.update(viewed=True)
return self.request.user.notifications.order_by('-id')[:20]
+
def notification(request, notif_id):
notif = Notification.objects.filter(id=notif_id).first()
if notif:
@@ -60,44 +59,50 @@ def notification(request, notif_id):
return redirect(notif.url)
return redirect("/")
+
def search_user(query, as_json=False):
res = SearchQuerySet().models(User).filter(text=query).filter_or(text__contains=query)[:20]
return [r.object for r in res]
+
def search_club(query, as_json=False):
clubs = []
if query:
clubs = Club.objects.filter(name__icontains=query).all()
clubs = clubs[:5]
- if as_json: # Re-loads json to avoid double encoding by JsonResponse, but still benefit from serializers
+ if as_json: # Re-loads json to avoid double encoding by JsonResponse, but still benefit from serializers
clubs = json.loads(serializers.serialize('json', clubs, fields=('name')))
else:
clubs = list(clubs)
return clubs
+
@login_required
def search_view(request):
result = {
- 'users': search_user(request.GET.get('query', '')),
- 'clubs': search_club(request.GET.get('query', '')),
- }
+ 'users': search_user(request.GET.get('query', '')),
+ 'clubs': search_club(request.GET.get('query', '')),
+ }
return render(request, "core/search.jinja", context={'result': result})
+
@login_required
def search_user_json(request):
result = {
- 'users': search_user(request.GET.get('query', ''), True),
- }
+ 'users': search_user(request.GET.get('query', ''), True),
+ }
return JsonResponse(result)
+
@login_required
def search_json(request):
result = {
- 'users': search_user(request.GET.get('query', ''), True),
- 'clubs': search_club(request.GET.get('query', ''), True),
- }
+ 'users': search_user(request.GET.get('query', ''), True),
+ 'clubs': search_club(request.GET.get('query', ''), True),
+ }
return JsonResponse(result)
+
class ToMarkdownView(TemplateView):
template_name = "core/to_markdown.jinja"
@@ -119,4 +124,3 @@ class ToMarkdownView(TemplateView):
kwargs['text'] = ""
kwargs['text_md'] = ""
return kwargs
-
diff --git a/core/views/user.py b/core/views/user.py
index ff85c033..99ecc355 100644
--- a/core/views/user.py
+++ b/core/views/user.py
@@ -24,30 +24,29 @@
# This file contains all the views that concern the user model
from django.shortcuts import render, redirect, get_object_or_404
-from django.contrib.auth import logout as auth_logout, views
+from django.contrib.auth import views
from django.utils.translation import ugettext as _
from django.core.urlresolvers import reverse
-from django.core.exceptions import PermissionDenied, ObjectDoesNotExist, ValidationError
+from django.core.exceptions import PermissionDenied, ValidationError
from django.http import Http404
from django.views.generic.edit import UpdateView
-from django.views.generic import ListView, DetailView, TemplateView, DeleteView
+from django.views.generic import ListView, DetailView, TemplateView
from django.forms.models import modelform_factory
from django.forms import CheckboxSelectMultiple
from django.template.response import TemplateResponse
from django.conf import settings
from django.views.generic.dates import YearMixin, MonthMixin
-from django.utils import timezone
-from datetime import timedelta, datetime, date
+from datetime import timedelta, date
import logging
from core.views import CanViewMixin, CanEditMixin, CanEditPropMixin, TabedViewMixin, QuickNotifMixin
-from core.views.forms import RegisteringForm, UserPropForm, UserProfileForm, LoginForm, UserGodfathersForm
+from core.views.forms import RegisteringForm, UserProfileForm, LoginForm, UserGodfathersForm
from core.models import User, SithFile, Preferences
-from club.models import Club
from subscription.models import Subscription
from trombi.views import UserTrombiForm
+
def login(request):
"""
The login view
@@ -56,24 +55,28 @@ def login(request):
"""
return views.login(request, template_name="core/login.jinja", authentication_form=LoginForm)
+
def logout(request):
"""
The logout view
"""
return views.logout_then_login(request)
+
def password_change(request):
"""
Allows a user to change its password
"""
return views.password_change(request, template_name="core/password_change.jinja", post_change_redirect=reverse("core:password_change_done"))
+
def password_change_done(request):
"""
Allows a user to change its password
"""
return views.password_change_done(request, template_name="core/password_change_done.jinja")
+
def password_root_change(request, user_id):
"""
Allows a root user to change someone's password
@@ -92,6 +95,7 @@ def password_root_change(request, user_id):
form = views.SetPasswordForm(user=user)
return TemplateResponse(request, "core/password_change.jinja", {'form': form, 'target': user})
+
def password_reset(request):
"""
Allows someone to enter an email adresse for resetting password
@@ -100,7 +104,8 @@ def password_reset(request):
template_name="core/password_reset.jinja",
email_template_name="core/password_reset_email.jinja",
post_reset_redirect="core:password_reset_done",
- )
+ )
+
def password_reset_done(request):
"""
@@ -108,6 +113,7 @@ def password_reset_done(request):
"""
return views.password_reset_done(request, template_name="core/password_reset_done.jinja")
+
def password_reset_confirm(request, uidb64=None, token=None):
"""
Provide a reset password formular
@@ -115,7 +121,8 @@ def password_reset_confirm(request, uidb64=None, token=None):
return views.password_reset_confirm(request, uidb64=uidb64, token=token,
post_reset_redirect="core:password_reset_complete",
template_name="core/password_reset_confirm.jinja",
- )
+ )
+
def password_reset_complete(request):
"""
@@ -123,14 +130,15 @@ def password_reset_complete(request):
"""
return views.password_reset_complete(request,
template_name="core/password_reset_complete.jinja",
- )
+ )
+
def register(request):
context = {}
if request.method == 'POST':
form = RegisteringForm(request.POST)
if form.is_valid():
- logging.debug("Registering "+form.cleaned_data['first_name']+form.cleaned_data['last_name'])
+ logging.debug("Registering " + form.cleaned_data['first_name'] + form.cleaned_data['last_name'])
u = form.save()
context['user_registered'] = u
context['tests'] = 'TEST_REGISTER_USER_FORM_OK'
@@ -143,6 +151,7 @@ def register(request):
context['form'] = form.as_p()
return render(request, "core/register.jinja", context)
+
class UserTabsMixin(TabedViewMixin):
def get_tabs_title(self):
return self.object.get_display_name()
@@ -150,67 +159,69 @@ class UserTabsMixin(TabedViewMixin):
def get_list_of_tabs(self):
tab_list = []
tab_list.append({
- 'url': reverse('core:user_profile', kwargs={'user_id': self.object.id}),
- 'slug': 'infos',
+ 'url': reverse('core:user_profile', kwargs={'user_id': self.object.id}),
+ 'slug': 'infos',
'name': _("Infos"),
- })
+ })
tab_list.append({
- 'url': reverse('core:user_godfathers', kwargs={'user_id': self.object.id}),
- 'slug': 'godfathers',
+ 'url': reverse('core:user_godfathers', kwargs={'user_id': self.object.id}),
+ 'slug': 'godfathers',
'name': _("Godfathers"),
- })
+ })
tab_list.append({
- 'url': reverse('core:user_pictures', kwargs={'user_id': self.object.id}),
- 'slug': 'pictures',
+ 'url': reverse('core:user_pictures', kwargs={'user_id': self.object.id}),
+ 'slug': 'pictures',
'name': _("Pictures"),
- })
+ })
if self.request.user == self.object:
tab_list.append({
- 'url': reverse('core:user_tools'),
- 'slug': 'tools',
+ 'url': reverse('core:user_tools'),
+ 'slug': 'tools',
'name': _("Tools"),
- })
+ })
if self.request.user.can_edit(self.object):
tab_list.append({
- 'url': reverse('core:user_edit', kwargs={'user_id': self.object.id}),
- 'slug': 'edit',
+ 'url': reverse('core:user_edit', kwargs={'user_id': self.object.id}),
+ 'slug': 'edit',
'name': _("Edit"),
- })
+ })
tab_list.append({
- 'url': reverse('core:user_prefs', kwargs={'user_id': self.object.id}),
- 'slug': 'prefs',
+ 'url': reverse('core:user_prefs', kwargs={'user_id': self.object.id}),
+ 'slug': 'prefs',
'name': _("Preferences"),
- })
+ })
if self.request.user.can_view(self.object):
tab_list.append({
- 'url': reverse('core:user_clubs', kwargs={'user_id': self.object.id}),
- 'slug': 'clubs',
+ 'url': reverse('core:user_clubs', kwargs={'user_id': self.object.id}),
+ 'slug': 'clubs',
'name': _("Clubs"),
- })
+ })
if self.request.user.is_owner(self.object):
tab_list.append({
- 'url': reverse('core:user_groups', kwargs={'user_id': self.object.id}),
- 'slug': 'groups',
+ 'url': reverse('core:user_groups', kwargs={'user_id': self.object.id}),
+ 'slug': 'groups',
'name': _("Groups"),
- })
+ })
try:
if (self.object.customer and (self.object == self.request.user
- or self.request.user.is_in_group(settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
- or self.request.user.is_in_group(settings.SITH_BAR_MANAGER['unix_name']+settings.SITH_BOARD_SUFFIX)
- or self.request.user.is_root)):
+ or self.request.user.is_in_group(settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
+ or self.request.user.is_in_group(settings.SITH_BAR_MANAGER['unix_name'] + settings.SITH_BOARD_SUFFIX)
+ or self.request.user.is_root)):
tab_list.append({
- 'url': reverse('core:user_stats', kwargs={'user_id': self.object.id}),
- 'slug': 'stats',
+ 'url': reverse('core:user_stats', kwargs={'user_id': self.object.id}),
+ 'slug': 'stats',
'name': _("Stats"),
- })
+ })
tab_list.append({
- 'url': reverse('core:user_account', kwargs={'user_id': self.object.id}),
- 'slug': 'account',
- 'name': _("Account")+" (%s €)" % self.object.customer.amount,
- })
- except: pass
+ 'url': reverse('core:user_account', kwargs={'user_id': self.object.id}),
+ 'slug': 'account',
+ 'name': _("Account") + " (%s €)" % self.object.customer.amount,
+ })
+ except:
+ pass
return tab_list
+
class UserView(UserTabsMixin, CanViewMixin, DetailView):
"""
Display a user's profile
@@ -225,8 +236,8 @@ class UserView(UserTabsMixin, CanViewMixin, DetailView):
def DeleteUserGodfathers(request, user_id, godfather_id, is_father):
user = User.objects.get(id=user_id)
if ((user == request.user) or
- request.user.is_root or
- request.user.is_board_member):
+ request.user.is_root or
+ request.user.is_board_member):
ud = get_object_or_404(User, id=godfather_id)
if is_father == "True":
user.godfathers.remove(ud)
@@ -236,6 +247,7 @@ def DeleteUserGodfathers(request, user_id, godfather_id, is_father):
raise PermissionDenied
return redirect('core:user_godfathers', user_id=user_id)
+
class UserPicturesView(UserTabsMixin, CanViewMixin, DetailView):
"""
Display a user's pictures
@@ -246,6 +258,7 @@ class UserPicturesView(UserTabsMixin, CanViewMixin, DetailView):
template_name = "core/user_pictures.jinja"
current_tab = 'pictures'
+
class UserGodfathersView(UserTabsMixin, CanViewMixin, DetailView):
"""
Display a user's godfathers
@@ -277,6 +290,7 @@ class UserGodfathersView(UserTabsMixin, CanViewMixin, DetailView):
kwargs['form'] = UserGodfathersForm()
return kwargs
+
class UserStatsView(UserTabsMixin, CanViewMixin, DetailView):
"""
Display a user's stats
@@ -295,7 +309,7 @@ class UserStatsView(UserTabsMixin, CanViewMixin, DetailView):
if not (profile == request.user
or request.user.is_in_group(settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
- or request.user.is_in_group(settings.SITH_BAR_MANAGER['unix_name']+settings.SITH_BOARD_SUFFIX)
+ or request.user.is_in_group(settings.SITH_BAR_MANAGER['unix_name'] + settings.SITH_BOARD_SUFFIX)
or request.user.is_root):
raise PermissionDenied
@@ -303,26 +317,27 @@ class UserStatsView(UserTabsMixin, CanViewMixin, DetailView):
def get_context_data(self, **kwargs):
kwargs = super(UserStatsView, self).get_context_data(**kwargs)
- from counter.models import Counter, Product, Selling
+ from counter.models import Counter
from django.db.models import Sum
foyer = Counter.objects.filter(name="Foyer").first()
mde = Counter.objects.filter(name="MDE").first()
gommette = Counter.objects.filter(name="La Gommette").first()
- semester_start=Subscription.compute_start(d=date.today(), duration=3)
- kwargs['total_perm_time'] = sum([p.end-p.start for p in self.object.permanencies.exclude(end=None)], timedelta())
- kwargs['total_foyer_time'] = sum([p.end-p.start for p in self.object.permanencies.filter(counter=foyer).exclude(end=None)], timedelta())
- kwargs['total_mde_time'] = sum([p.end-p.start for p in self.object.permanencies.filter(counter=mde).exclude(end=None)], timedelta())
- kwargs['total_gommette_time'] = sum([p.end-p.start for p in self.object.permanencies.filter(counter=gommette).exclude(end=None)], timedelta())
- kwargs['total_foyer_buyings'] = sum([b.unit_price*b.quantity for b in
- self.object.customer.buyings.filter(counter=foyer, date__gte=semester_start)])
- kwargs['total_mde_buyings'] = sum([b.unit_price*b.quantity for b in self.object.customer.buyings.filter(counter=mde,
- date__gte=semester_start)])
- kwargs['total_gommette_buyings'] = sum([b.unit_price*b.quantity for b in
- self.object.customer.buyings.filter(counter=gommette, date__gte=semester_start)])
+ semester_start = Subscription.compute_start(d=date.today(), duration=3)
+ kwargs['total_perm_time'] = sum([p.end - p.start for p in self.object.permanencies.exclude(end=None)], timedelta())
+ kwargs['total_foyer_time'] = sum([p.end - p.start for p in self.object.permanencies.filter(counter=foyer).exclude(end=None)], timedelta())
+ kwargs['total_mde_time'] = sum([p.end - p.start for p in self.object.permanencies.filter(counter=mde).exclude(end=None)], timedelta())
+ kwargs['total_gommette_time'] = sum([p.end - p.start for p in self.object.permanencies.filter(counter=gommette).exclude(end=None)], timedelta())
+ kwargs['total_foyer_buyings'] = sum([b.unit_price * b.quantity for b in
+ self.object.customer.buyings.filter(counter=foyer, date__gte=semester_start)])
+ kwargs['total_mde_buyings'] = sum([b.unit_price * b.quantity for b in self.object.customer.buyings.filter(counter=mde,
+ date__gte=semester_start)])
+ kwargs['total_gommette_buyings'] = sum([b.unit_price * b.quantity for b in
+ self.object.customer.buyings.filter(counter=gommette, date__gte=semester_start)])
kwargs['top_product'] = self.object.customer.buyings.values('product__name').annotate(
- product_sum=Sum('quantity')).exclude(product_sum=None).order_by('-product_sum').all()[:10]
+ product_sum=Sum('quantity')).exclude(product_sum=None).order_by('-product_sum').all()[:10]
return kwargs
+
class UserMiniView(CanViewMixin, DetailView):
"""
Display a user's profile
@@ -332,6 +347,7 @@ class UserMiniView(CanViewMixin, DetailView):
context_object_name = "profile"
template_name = "core/user_mini.jinja"
+
class UserListView(ListView, CanEditPropMixin):
"""
Displays the user list
@@ -339,6 +355,7 @@ class UserListView(ListView, CanEditPropMixin):
model = User
template_name = "core/user_list.jinja"
+
class UserUploadProfilePictView(CanEditMixin, DetailView):
"""
Handle the upload of the profile picture taken with webcam in navigator
@@ -356,17 +373,18 @@ class UserUploadProfilePictView(CanEditMixin, DetailView):
raise ValidationError(_("User already has a profile picture"))
f = request.FILES['new_profile_pict']
parent = SithFile.objects.filter(parent=None, name="profiles").first()
- name = str(self.object.id) + "_profile.jpg" # Webcamejs uploads JPGs
+ name = str(self.object.id) + "_profile.jpg" # Webcamejs uploads JPGs
im = Image.open(BytesIO(f.read()))
new_file = SithFile(parent=parent, name=name,
- file=resize_image(im, 400, f.content_type.split('/')[-1]),
- owner=self.object, is_folder=False, mime_type=f.content_type, size=f._size)
+ file=resize_image(im, 400, f.content_type.split('/')[-1]),
+ owner=self.object, is_folder=False, mime_type=f.content_type, size=f._size)
new_file.file.name = name
new_file.save()
self.object.profile_pict = new_file
self.object.save()
return redirect("core:user_edit", user_id=self.object.id)
+
class UserUpdateProfileView(UserTabsMixin, CanEditMixin, UpdateView):
"""
Edit a user's profile
@@ -412,6 +430,7 @@ class UserUpdateProfileView(UserTabsMixin, CanEditMixin, UpdateView):
kwargs['form'] = self.form
return kwargs
+
class UserClubView(UserTabsMixin, CanViewMixin, DetailView):
"""
Display the user's club(s)
@@ -422,6 +441,7 @@ class UserClubView(UserTabsMixin, CanViewMixin, DetailView):
template_name = "core/user_clubs.jinja"
current_tab = "clubs"
+
class UserPreferencesView(UserTabsMixin, CanEditMixin, UpdateView):
"""
Edit a user's preferences
@@ -453,6 +473,7 @@ class UserPreferencesView(UserTabsMixin, CanEditMixin, UpdateView):
kwargs['trombi_form'] = UserTrombiForm()
return kwargs
+
class UserUpdateGroupView(UserTabsMixin, CanEditPropMixin, UpdateView):
"""
Edit a user's groups
@@ -461,10 +482,11 @@ class UserUpdateGroupView(UserTabsMixin, CanEditPropMixin, UpdateView):
pk_url_kwarg = "user_id"
template_name = "core/user_group.jinja"
form_class = modelform_factory(User, fields=['groups'],
- widgets={'groups':CheckboxSelectMultiple})
+ widgets={'groups': CheckboxSelectMultiple})
context_object_name = "profile"
current_tab = "groups"
+
class UserToolsView(QuickNotifMixin, UserTabsMixin, TemplateView):
"""
Displays the logged user's tools
@@ -481,6 +503,7 @@ class UserToolsView(QuickNotifMixin, UserTabsMixin, TemplateView):
kwargs['object'] = self.request.user
return kwargs
+
class UserAccountBase(UserTabsMixin, DetailView):
"""
Base class for UserAccount
@@ -489,15 +512,16 @@ class UserAccountBase(UserTabsMixin, DetailView):
pk_url_kwarg = "user_id"
current_tab = "account"
- def dispatch(self, request, *arg, **kwargs): # Manually validates the rights
+ def dispatch(self, request, *arg, **kwargs): # Manually validates the rights
res = super(UserAccountBase, self).dispatch(request, *arg, **kwargs)
if (self.object == request.user
or request.user.is_in_group(settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
- or request.user.is_in_group(settings.SITH_BAR_MANAGER['unix_name']+settings.SITH_BOARD_SUFFIX)
+ or request.user.is_in_group(settings.SITH_BAR_MANAGER['unix_name'] + settings.SITH_BOARD_SUFFIX)
or request.user.is_root):
return res
raise PermissionDenied
+
class UserAccountView(UserAccountBase):
"""
Display a user's account
@@ -511,14 +535,14 @@ class UserAccountView(UserAccountBase):
stats.append([])
i = 0
for month in obj.filter(date__year=year.year).datetimes(
- 'date', 'month', order='DESC'):
+ 'date', 'month', order='DESC'):
q = obj.filter(
date__year=month.year,
date__month=month.month
)
stats[i].append({
- 'sum':sum([calc(p) for p in q]),
- 'date':month
+ 'sum': sum([calc(p) for p in q]),
+ 'date': month
})
i += 1
return stats
@@ -551,6 +575,7 @@ class UserAccountView(UserAccountBase):
print(repr(e))
return kwargs
+
class UserAccountDetailView(UserAccountBase, YearMixin, MonthMixin):
"""
Display a user's account for month
@@ -568,4 +593,3 @@ class UserAccountDetailView(UserAccountBase, YearMixin, MonthMixin):
pass
kwargs['tab'] = "account"
return kwargs
-