From f2c3c7dc2571dacfd530d0a6c9c0c92da641c07a Mon Sep 17 00:00:00 2001 From: Skia Date: Mon, 22 Aug 2016 18:44:03 +0200 Subject: [PATCH] Add viewable flag for user --- .../0008_user_is_subscriber_viewable.py | 19 ++ core/models.py | 4 + core/views/forms.py | 2 +- locale/fr/LC_MESSAGES/django.mo | Bin 29001 -> 29034 bytes locale/fr/LC_MESSAGES/django.po | 170 ++++++++++-------- migrate.py | 34 ++-- 6 files changed, 132 insertions(+), 97 deletions(-) create mode 100644 core/migrations/0008_user_is_subscriber_viewable.py diff --git a/core/migrations/0008_user_is_subscriber_viewable.py b/core/migrations/0008_user_is_subscriber_viewable.py new file mode 100644 index 00000000..895de548 --- /dev/null +++ b/core/migrations/0008_user_is_subscriber_viewable.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0007_auto_20160813_0522'), + ] + + operations = [ + migrations.AddField( + model_name='user', + name='is_subscriber_viewable', + field=models.BooleanField(default=True, verbose_name='is subscriber viewable'), + ), + ] diff --git a/core/models.py b/core/models.py index c3d3d772..a8d9dce0 100644 --- a/core/models.py +++ b/core/models.py @@ -167,6 +167,7 @@ class User(AbstractBaseUser): parent_phone = PhoneNumberField(_("parent phone"), null=True, blank=True) address = models.CharField(_("address"), max_length=128, blank=True, default="") parent_address = models.CharField(_("parent address"), max_length=128, blank=True, default="") + is_subscriber_viewable = models.BooleanField(_("is subscriber viewable"), default=True) objects = UserManager() @@ -359,6 +360,9 @@ class User(AbstractBaseUser): def can_be_edited_by(self, user): return user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) or user.is_root + def can_be_viewed_by(self, user): + return (user.is_in_group(settings.SITH_MAIN_MEMBERS_GROUP) and self.is_subscriber_viewable) or user.is_root + def get_mini_item(self): return """
diff --git a/core/views/forms.py b/core/views/forms.py index 227ed121..f0c5b530 100644 --- a/core/views/forms.py +++ b/core/views/forms.py @@ -98,7 +98,7 @@ class UserProfileForm(forms.ModelForm): 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'] + 'forum_signature', 'is_subscriber_viewable'] widgets = { 'date_of_birth': SelectDate, 'profile_pict': forms.ClearableFileInput, diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo index 3cde4cbc23809cae7d7629bf4ccc7453c910447b..0a5a5fcbbabf4aee5b67f0d0146f487978ef1515 100644 GIT binary patch delta 6256 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 diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 52944fe9..304184da 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-20 21:11+0200\n" +"POT-Creation-Date: 2016-08-22 18:13+0200\n" "PO-Revision-Date: 2016-07-18\n" "Last-Translator: Skia \n" "Language-Team: AE info \n" @@ -66,7 +66,7 @@ msgstr "montant effectif" msgid "number" msgstr "numéro" -#: accounting/models.py:154 core/models.py:426 core/models.py:702 +#: accounting/models.py:154 core/models.py:430 core/models.py:706 #: counter/models.py:215 counter/models.py:261 eboutic/models.py:14 #: eboutic/models.py:47 msgid "date" @@ -218,6 +218,7 @@ msgstr "Éditer" #: accounting/templates/accounting/bank_account_list.jinja:16 #: core/templates/core/file_detail.jinja:43 #: core/templates/core/group_list.jinja:13 +#: core/templates/core/user_edit.jinja:18 #: launderette/templates/launderette/launderette_admin.jinja:16 #: launderette/views.py:146 msgid "Delete" @@ -767,120 +768,124 @@ msgstr "téléphone des parents" msgid "parent address" msgstr "adresse des parents" -#: core/models.py:256 +#: core/models.py:170 +msgid "is subscriber viewable" +msgstr "profil visible par les cotisants" + +#: core/models.py:257 msgid "A user with that username already exists" msgstr "Un utilisateur de ce nom d'utilisateur existe déjà" -#: core/models.py:372 core/templates/core/macros.jinja:17 +#: core/models.py:376 core/templates/core/macros.jinja:17 #: core/templates/core/user_detail.jinja:14 #: core/templates/core/user_detail.jinja:16 -#: core/templates/core/user_edit.jinja:15 +#: core/templates/core/user_edit.jinja:16 msgid "Profile" msgstr "Profil" -#: core/models.py:403 +#: core/models.py:407 msgid "Visitor" msgstr "Visiteur" -#: core/models.py:408 +#: core/models.py:412 msgid "define if we show a users stats" msgstr "Definit si l'on montre les statistiques de l'utilisateur" -#: core/models.py:410 +#: core/models.py:414 msgid "Show your account statistics to others" msgstr "Montrez vos statistiques de compte aux autres" -#: core/models.py:417 +#: core/models.py:421 msgid "file name" msgstr "nom du fichier" -#: core/models.py:418 core/models.py:551 +#: core/models.py:422 core/models.py:555 msgid "parent" msgstr "parent" -#: core/models.py:419 core/models.py:429 +#: core/models.py:423 core/models.py:433 msgid "file" msgstr "fichier" -#: core/models.py:420 +#: core/models.py:424 msgid "owner" msgstr "propriétaire" -#: core/models.py:421 core/models.py:557 +#: core/models.py:425 core/models.py:561 msgid "edit group" msgstr "groupe d'édition" -#: core/models.py:422 core/models.py:558 +#: core/models.py:426 core/models.py:562 msgid "view group" msgstr "groupe de vue" -#: core/models.py:423 +#: core/models.py:427 msgid "is folder" msgstr "est un dossier" -#: core/models.py:424 +#: core/models.py:428 msgid "mime type" msgstr "type mime" -#: core/models.py:425 +#: core/models.py:429 msgid "size" msgstr "taille" -#: core/models.py:455 +#: core/models.py:459 msgid "Character '/' not authorized in name" msgstr "Le caractère '/' n'est pas autorisé dans les noms de fichier" -#: core/models.py:458 core/models.py:463 +#: core/models.py:462 core/models.py:467 msgid "Loop in folder tree" msgstr "Boucle dans l'arborescence des dossiers" -#: core/models.py:467 +#: core/models.py:471 msgid "You can not make a file be a children of a non folder file" msgstr "" "Vous ne pouvez pas mettre un fichier enfant de quelque chose qui n'est pas " "un dossier" -#: core/models.py:471 +#: core/models.py:475 msgid "Duplicate file" msgstr "Un fichier de ce nom existe déjà" -#: core/models.py:481 +#: core/models.py:485 msgid "You must provide a file" msgstr "Vous devez fournir un fichier" -#: core/models.py:506 +#: core/models.py:510 msgid "Folder: " msgstr "Dossier : " -#: core/models.py:508 +#: core/models.py:512 msgid "File: " msgstr "Fichier : " -#: core/models.py:550 core/models.py:554 +#: core/models.py:554 core/models.py:558 msgid "page name" msgstr "nom de la page" -#: core/models.py:555 +#: core/models.py:559 msgid "owner group" msgstr "groupe propriétaire" -#: core/models.py:586 +#: core/models.py:590 msgid "Duplicate page" msgstr "Une page de ce nom existe déjà" -#: core/models.py:592 +#: core/models.py:596 msgid "Loop in page tree" msgstr "Boucle dans l'arborescence des pages" -#: core/models.py:699 +#: core/models.py:703 msgid "revision" msgstr "révision" -#: core/models.py:700 +#: core/models.py:704 msgid "page title" msgstr "titre de la page" -#: core/models.py:701 +#: core/models.py:705 msgid "page content" msgstr "contenu de la page" @@ -970,7 +975,7 @@ msgstr "Confirmation" #: core/templates/core/delete_confirm.jinja:14 #: core/templates/core/file_delete_confirm.jinja:14 -#: counter/templates/counter/counter_click.jinja:83 +#: counter/templates/counter/counter_click.jinja:73 msgid "Cancel" msgstr "Annuler" @@ -1039,7 +1044,7 @@ msgid "Edit group" msgstr "Éditer le groupe" #: core/templates/core/group_edit.jinja:9 -#: core/templates/core/user_edit.jinja:24 +#: core/templates/core/user_edit.jinja:36 #: core/templates/core/user_group.jinja:8 msgid "Update" msgstr "Mettre à jour" @@ -1347,35 +1352,39 @@ msgstr "Éditer le profil de l'utilisateur" msgid "Current profile: " msgstr "Profil actuel : " -#: core/templates/core/user_edit.jinja:17 +#: core/templates/core/user_edit.jinja:24 +msgid "Take picture" +msgstr "" + +#: core/templates/core/user_edit.jinja:29 msgid "Current avatar: " msgstr "Avatar actuel : " -#: core/templates/core/user_edit.jinja:18 +#: core/templates/core/user_edit.jinja:30 msgid "Avatar" msgstr "Avatar" -#: core/templates/core/user_edit.jinja:20 +#: core/templates/core/user_edit.jinja:32 msgid "Current scrub: " msgstr "Blouse actuelle : " -#: core/templates/core/user_edit.jinja:21 +#: core/templates/core/user_edit.jinja:33 msgid "Scrub" msgstr "Blouse" -#: core/templates/core/user_edit.jinja:25 +#: core/templates/core/user_edit.jinja:37 msgid "Username: " msgstr "Nom d'utilisateur : " -#: core/templates/core/user_edit.jinja:27 +#: core/templates/core/user_edit.jinja:39 msgid "Account number: " msgstr "Numero de compte : " -#: core/templates/core/user_edit.jinja:30 +#: core/templates/core/user_edit.jinja:42 msgid "Change my password" msgstr "Changer mon mot de passe" -#: core/templates/core/user_edit.jinja:32 +#: core/templates/core/user_edit.jinja:44 msgid "Change user password" msgstr "Changer le mot de passe" @@ -1414,7 +1423,7 @@ msgstr "Gestion de Sith" msgid "Subscriptions" msgstr "Cotisations" -#: core/templates/core/user_tools.jinja:22 counter/views.py:468 +#: core/templates/core/user_tools.jinja:22 counter/views.py:470 msgid "Counters" msgstr "Comptoirs" @@ -1451,7 +1460,7 @@ msgstr "Ajouter un nouveau dossier" msgid "Error creating folder %(folder_name)s: %(msg)s" msgstr "Erreur de création du dossier %(folder_name)s : %(msg)s" -#: core/views/files.py:62 core/views/forms.py:168 core/views/forms.py:172 +#: core/views/files.py:61 core/views/forms.py:152 core/views/forms.py:156 #, python-format msgid "Error uploading file %(file_name)s: %(msg)s" msgstr "Erreur d'envoie du fichier %(file_name)s : %(msg)s" @@ -1464,7 +1473,7 @@ msgstr "Choisir un fichier" msgid "Choose user" msgstr "Choisir un utilisateur" -#: core/views/forms.py:127 +#: core/views/forms.py:111 msgid "" "Profile: you need to be visible on the picture, in order to be recognized (e." "g. by the barmen)" @@ -1472,18 +1481,22 @@ msgstr "" "Photo de profil: vous devez être visible sur la photo afin d'être reconnu " "(par exemple par les barmen)" -#: core/views/forms.py:128 +#: core/views/forms.py:112 msgid "Avatar: used on the forum" msgstr "Avatar : utilisé sur le forum" -#: core/views/forms.py:129 +#: core/views/forms.py:113 msgid "Scrub: let other know how your scrub looks like!" msgstr "Blouse : montrez aux autres à quoi ressemble votre blouse !" -#: core/views/forms.py:173 +#: core/views/forms.py:157 msgid "Bad image format, only jpeg, png, and gif are accepted" msgstr "Mauvais format d'image, seuls les jpeg, png, et gif sont acceptés" +#: core/views/user.py:178 +msgid "User already has a profile picture" +msgstr "" + #: counter/models.py:24 msgid "account id" msgstr "numéro de compte" @@ -1496,7 +1509,7 @@ msgstr "client" msgid "customers" msgstr "clients" -#: counter/models.py:44 counter/templates/counter/counter_click.jinja:53 +#: counter/models.py:44 counter/templates/counter/counter_click.jinja:43 msgid "Not enough money" msgstr "Solde insuffisant" @@ -1610,49 +1623,45 @@ msgstr "permanence" msgid "Customer" msgstr "Client" -#: counter/templates/counter/counter_click.jinja:35 -msgid "Refilling" -msgstr "Rechargement" +#: counter/templates/counter/counter_click.jinja:34 +#: launderette/templates/launderette/launderette_admin.jinja:8 +msgid "Selling" +msgstr "Vente" + +#: counter/templates/counter/counter_click.jinja:37 +msgid "Too young for that product" +msgstr "Trop jeune pour ce produit" #: counter/templates/counter/counter_click.jinja:40 -#: counter/templates/counter/counter_click.jinja:59 +msgid "Not allowed for that product" +msgstr "Non autorisé pour ce produit" + +#: counter/templates/counter/counter_click.jinja:49 +#: counter/templates/counter/counter_click.jinja:83 #: launderette/templates/launderette/launderette_admin.jinja:35 #: launderette/templates/launderette/launderette_click.jinja:14 msgid "Go" msgstr "Valider" -#: counter/templates/counter/counter_click.jinja:45 -#: launderette/templates/launderette/launderette_admin.jinja:8 -msgid "Selling" -msgstr "Vente" - -#: counter/templates/counter/counter_click.jinja:47 -msgid "Too young for that product" -msgstr "Trop jeune pour ce produit" - -#: counter/templates/counter/counter_click.jinja:50 -msgid "Not allowed for that product" -msgstr "Non autorisé pour ce produit" - -#: counter/templates/counter/counter_click.jinja:61 +#: counter/templates/counter/counter_click.jinja:51 #: eboutic/templates/eboutic/eboutic_main.jinja:27 #: eboutic/templates/eboutic/eboutic_makecommand.jinja:11 msgid "Basket: " msgstr "Panier : " -#: counter/templates/counter/counter_click.jinja:74 +#: counter/templates/counter/counter_click.jinja:64 #: counter/templates/counter/counter_main.jinja:28 #: eboutic/templates/eboutic/eboutic_main.jinja:34 msgid "Total: " msgstr "Total : " -#: counter/templates/counter/counter_click.jinja:78 +#: counter/templates/counter/counter_click.jinja:68 msgid "Finish" msgstr "Terminer" -#: counter/templates/counter/counter_click.jinja:85 -msgid "Products: " -msgstr "Produits : " +#: counter/templates/counter/counter_click.jinja:77 +msgid "Refilling" +msgstr "Rechargement" #: counter/templates/counter/counter_list.jinja:4 #: counter/templates/counter/counter_list.jinja:10 @@ -1752,23 +1761,23 @@ msgstr "Mauvais identifiants" msgid "User is not subscriber" msgstr "L'utilisateur n'est pas cotisant." -#: counter/views.py:253 +#: counter/views.py:257 msgid "END" msgstr "FIN" -#: counter/views.py:255 +#: counter/views.py:259 msgid "CAN" msgstr "ANN" -#: counter/views.py:285 +#: counter/views.py:289 msgid "You have not enough money to buy all the basket" msgstr "Vous n'avez pas assez d'argent pour acheter le panier" -#: counter/views.py:465 +#: counter/views.py:467 msgid "Parent product" msgstr "Produit parent" -#: counter/views.py:466 +#: counter/views.py:468 msgid "Buying groups" msgstr "Groupes d'achat" @@ -1831,7 +1840,7 @@ msgstr "Le paiement a été effectué" msgid "Return to eboutic" msgstr "Retourner à l'eboutic" -#: eboutic/views.py:136 +#: eboutic/views.py:138 msgid "You do not have enough money to buy the basket" msgstr "Vous n'avez pas assez d'argent pour acheter le panier" @@ -2117,14 +2126,17 @@ msgstr "Vous ne pouvez pas cotiser plusieurs fois pour la même période" msgid "You are trying to create a subscription without member" msgstr "Vous essayez de créer une cotisation sans membre" -#: subscription/views.py:52 +#: subscription/views.py:51 msgid "A user with that email address already exists" msgstr "Un utilisateur avec cette adresse email existe déjà" -#: subscription/views.py:67 +#: subscription/views.py:66 msgid "You must either choose an existing user or create a new one properly" msgstr "" "Vous devez soit choisir un utilisateur existant, ou en créer un proprement." +#~ msgid "Products: " +#~ msgstr "Produits : " + #~ msgid "Club: " #~ msgstr "Club : " diff --git a/migrate.py b/migrate.py index 688a7bc8..bac234a5 100644 --- a/migrate.py +++ b/migrate.py @@ -132,6 +132,7 @@ def migrate_users(): parent_address=(to_unicode(u['adresse_parents']) + ", " + to_unicode(u['cpostal_parents']) + " " + to_unicode(u['ville_parents'])), phone=u['tel_portable_utl'] or "", parent_phone=u['tel_parents'] or "", + is_subscriber_viewable=bool(u['publique_utl']), ) new.generate_username() new.save() @@ -602,24 +603,23 @@ def migrate_permanencies(): cur.close() def main(): - # migrate_users() - # migrate_profile_pict() - # migrate_clubs() - # migrate_club_memberships() - # migrate_subscriptions() - # update_customer_account() - # migrate_counters() - # migrate_permanencies() - # migrate_typeproducts() - # migrate_products() - # migrate_product_pict() - # migrate_products_to_counter() + migrate_users() + migrate_profile_pict() + migrate_clubs() + migrate_club_memberships() + migrate_subscriptions() + update_customer_account() + migrate_counters() + migrate_permanencies() + migrate_typeproducts() + migrate_products() + migrate_product_pict() + migrate_products_to_counter() # reset_customer_amount() - # migrate_invoices() - # migrate_refillings() - # migrate_sellings() - reset_index('core') - # reset_index('core', 'club', 'subscription', 'accounting', 'eboutic', 'launderette', 'counter') + migrate_invoices() + migrate_refillings() + migrate_sellings() + reset_index('core', 'club', 'subscription', 'accounting', 'eboutic', 'launderette', 'counter') if __name__ == "__main__": main()