From 88e088e3bc46adf3bf13cf765666d22de5ff0581 Mon Sep 17 00:00:00 2001
From: yaniv14 <yanivmirel@gmail.com>
Date: Sun, 17 Jul 2016 11:43:48 +0300
Subject: [PATCH] Validating community group role upon save to be from same
 community.

Added member groups list display in admin.
---
 src/acl/locale/he/LC_MESSAGES/django.mo       | Bin 4346 -> 4346 bytes
 src/acl/locale/he/LC_MESSAGES/django.po       |   2 +-
 .../locale/he/LC_MESSAGES/django.mo           | Bin 16554 -> 16816 bytes
 .../locale/he/LC_MESSAGES/django.po           | 152 +++++++++---------
 .../locale/he/LC_MESSAGES/djangojs.mo         | Bin 499 -> 499 bytes
 .../locale/he/LC_MESSAGES/djangojs.po         |   2 +-
 src/communities/models.py                     |  13 ++
 src/issues/locale/he/LC_MESSAGES/django.mo    | Bin 9910 -> 9910 bytes
 src/issues/locale/he/LC_MESSAGES/django.po    |   2 +-
 src/issues/locale/he/LC_MESSAGES/djangojs.mo  | Bin 541 -> 541 bytes
 src/issues/locale/he/LC_MESSAGES/djangojs.po  |   2 +-
 src/meetings/locale/he/LC_MESSAGES/django.mo  | Bin 3938 -> 3938 bytes
 src/meetings/locale/he/LC_MESSAGES/django.po  |   6 +-
 src/ocd/locale/he/LC_MESSAGES/django.mo       | Bin 6157 -> 6157 bytes
 src/ocd/locale/he/LC_MESSAGES/django.po       |   2 +-
 src/users/admin.py                            |  14 +-
 src/users/locale/he/LC_MESSAGES/django.mo     | Bin 8077 -> 8146 bytes
 src/users/locale/he/LC_MESSAGES/django.po     | 118 +++++++-------
 18 files changed, 174 insertions(+), 139 deletions(-)

diff --git a/src/acl/locale/he/LC_MESSAGES/django.mo b/src/acl/locale/he/LC_MESSAGES/django.mo
index 5892504b325c937a6e36777be2629abc7a89fefa..dfcb65dd9531183139dc5acedf6db75b7bc5c263 100644
GIT binary patch
delta 22
dcmeyR_)BraAx=(nT|;vPLqjX$&8Io_*#Th#2QvTw

delta 16
YcmeyR_)BraA<oIKI0ZIe;?!UV07g3p1poj5

diff --git a/src/acl/locale/he/LC_MESSAGES/django.po b/src/acl/locale/he/LC_MESSAGES/django.po
index 7f448a83..b63e4540 100644
--- a/src/acl/locale/he/LC_MESSAGES/django.po
+++ b/src/acl/locale/he/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-07 11:27+0300\n"
+"POT-Creation-Date: 2016-07-17 11:37+0300\n"
 "PO-Revision-Date: 2016-06-07 11:27+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
diff --git a/src/communities/locale/he/LC_MESSAGES/django.mo b/src/communities/locale/he/LC_MESSAGES/django.mo
index 96ffccbfbe4a9c144bb5fa873d21beb3bf072f9f..861f0ab52c8f3a3f61bf33eb0a84055528c5731c 100644
GIT binary patch
delta 4817
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

delta 4626
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

diff --git a/src/communities/locale/he/LC_MESSAGES/django.po b/src/communities/locale/he/LC_MESSAGES/django.po
index ac32d7d1..4d22c100 100644
--- a/src/communities/locale/he/LC_MESSAGES/django.po
+++ b/src/communities/locale/he/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Open Community\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-07 11:26+0300\n"
-"PO-Revision-Date: 2016-06-05 14:45+0300\n"
+"POT-Creation-Date: 2016-07-17 11:37+0300\n"
+"PO-Revision-Date: 2016-07-17 11:39+0300\n"
 "Last-Translator: Yaniv Mirel <yanivmirel@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "Communities & Committees"
 msgstr "קהילות וועדות"
 
-#: .\forms.py:35 .\models.py:619
+#: .\forms.py:35 .\models.py:621
 msgid "Title"
 msgstr "כותרת"
 
@@ -44,213 +44,217 @@ msgstr "רקע"
 msgid "Me only"
 msgstr "רק לי (לבדיקה)"
 
-#: .\models.py:32 .\models.py:39
+#: .\models.py:33 .\models.py:40
 msgid "Me only (review)"
 msgstr "רק לי (לבדיקה)"
 
-#: .\models.py:33
+#: .\models.py:34
 msgid "Only attendees"
 msgstr "למשתתפים בפגישה בלבד"
 
-#: .\models.py:34 .\models.py:40
+#: .\models.py:35 .\models.py:41
 msgid "The board"
 msgstr "לועד בלבד"
 
-#: .\models.py:35 .\models.py:41
+#: .\models.py:36 .\models.py:42
 msgid "All members"
 msgstr "לכל חברי הקהילה"
 
-#: .\models.py:47 .\models.py:144 .\models.py:607
-#: .\templates\communities\participants_form.html:120
+#: .\models.py:48 .\models.py:145 .\models.py:609
+#: .\templates\communities\participants_form.html:70
 msgid "Name"
 msgstr "שם"
 
-#: .\models.py:48 .\models.py:145
+#: .\models.py:49 .\models.py:146
 msgid "Friendly URL"
 msgstr "URL ידידותי"
 
-#: .\models.py:49 .\models.py:146
+#: .\models.py:50 .\models.py:147
 msgid "Public community"
 msgstr "פתוחה לציבור"
 
-#: .\models.py:51
+#: .\models.py:52
 msgid "Community logo"
 msgstr "לוגו קהילה"
 
-#: .\models.py:53
+#: .\models.py:54
 msgid "Community identifier"
 msgstr "מזהה קהילה"
 
-#: .\models.py:57 .\models.py:186
+#: .\models.py:58 .\models.py:187
 msgid "Straw voting enabled"
 msgstr "אפשר הצבעת קש"
 
-#: .\models.py:61 .\models.py:190
+#: .\models.py:62 .\models.py:191
 msgid "Issue ranking votes enabled"
 msgstr "אפשר תיעדוף נושאים"
 
-#: .\models.py:63 .\models.py:192
+#: .\models.py:64 .\models.py:193
 msgid "Straw Vote ends at"
 msgstr "הצבעת שבשבת עד"
 
-#: .\models.py:66 .\models.py:195
+#: .\models.py:67 .\models.py:196
 msgid "Referendum started"
 msgstr "משאל התחיל"
 
-#: .\models.py:69 .\models.py:198
+#: .\models.py:70 .\models.py:199
 msgid "Referendum started at"
 msgstr "משאל התחיל ב"
 
-#: .\models.py:72 .\models.py:201
+#: .\models.py:73 .\models.py:202
 msgid "Referendum ends at"
 msgstr "משאל הסתיים ב"
 
-#: .\models.py:75 .\models.py:204
+#: .\models.py:76 .\models.py:205
 msgid "Default quorum"
 msgstr ""
 
-#: .\models.py:79 .\models.py:208
+#: .\models.py:80 .\models.py:209
 msgid "Allow links inside emails"
 msgstr "אפשר קישורים בתוך אימייל"
 
-#: .\models.py:81 .\models.py:210
+#: .\models.py:82 .\models.py:211
 msgid "Send mails to invitees"
 msgstr "שלח מייל למוזמנים"
 
-#: .\models.py:85 .\models.py:214
+#: .\models.py:86 .\models.py:215
 msgid "Register missing board members"
 msgstr "רישום חברי ועד חסרים"
 
-#: .\models.py:88 .\models.py:217
+#: .\models.py:89 .\models.py:218
 msgid "Inform System Manager"
 msgstr "להודיע למנהל המערכת"
 
-#: .\models.py:91
+#: .\models.py:92
 msgid "Community without meetings?"
 msgstr "קהילות ללא פגישות?"
 
-#: .\models.py:94 .\models.py:142 .\models.py:618
+#: .\models.py:95 .\models.py:143 .\models.py:620
 msgid "Community"
 msgstr "קהילה"
 
-#: .\models.py:95
+#: .\models.py:96
 msgid "Communities"
 msgstr "קהילות"
 
-#: .\models.py:148
+#: .\models.py:149
 msgid "Committee logo"
 msgstr "לוגו ועדה"
 
-#: .\models.py:150
+#: .\models.py:151
 msgid "Committee identifier"
 msgstr "מזהה ועדה"
 
-#: .\models.py:154
+#: .\models.py:155
 msgid "Meeting started"
 msgstr "הפגישה התחילה"
 
-#: .\models.py:156
+#: .\models.py:157
 msgid "Upcoming meeting title"
 msgstr "כותרת הפגישה הקרובה"
 
-#: .\models.py:160
+#: .\models.py:161
 msgid "Upcoming meeting scheduled at"
 msgstr "מועד הפגישה הקרובה"
 
-#: .\models.py:162
+#: .\models.py:163
 msgid "Upcoming meeting location"
 msgstr "מיקום הפגישה הקרובה"
 
-#: .\models.py:163
+#: .\models.py:164
 msgid "Upcoming meeting background"
 msgstr "רקע לפגישה הקרובה"
 
-#: .\models.py:168
+#: .\models.py:169
 msgid "Participants in upcoming meeting"
 msgstr "משתתפים בפגישה הקרובה"
 
-#: .\models.py:171
+#: .\models.py:172
 msgid "Guests in upcoming meeting"
 msgstr "אורחים בפגישה הקרובה"
 
-#: .\models.py:172
+#: .\models.py:173
 msgid "Enter each guest in a separate line"
 msgstr "נא לרשום כל שם בשורה נפרדת"
 
-#: .\models.py:175
+#: .\models.py:176
 msgid "Upcoming meeting version"
 msgstr "מספר גרסת נתוני הפגישה הקרובה"
 
-#: .\models.py:178
+#: .\models.py:179
 msgid "Upcoming meeting is published"
 msgstr "האם הפגישה הקרובה פורסמה?"
 
-#: .\models.py:181
+#: .\models.py:182
 msgid "Upcoming meeting published at"
 msgstr "מועד פרסום הפגישה הקרובה"
 
-#: .\models.py:183
+#: .\models.py:184
 msgid "Upcoming meeting summary"
 msgstr "סיכום הפגישה הקרובה"
 
-#: .\models.py:220
+#: .\models.py:221
 msgid "Committee without meetings?"
 msgstr "ועדה ללא פגישות?"
 
-#: .\models.py:223 .\models.py:642
+#: .\models.py:224 .\models.py:644
 #: .\templates\communities\communitygrouprole_list.html:14
 msgid "Committee"
 msgstr "ועדה"
 
-#: .\models.py:224 .\templates\_committee_panel.html:6
+#: .\models.py:225 .\templates\_committee_panel.html:6
 #: .\templates\_community_panel.html:13
 #: .\templates\communities\communitygroup_list.html:31
 msgid "Committees"
 msgstr "ועדות"
 
-#: .\models.py:595
+#: .\models.py:597
 msgid "Confidential Reason"
 msgstr "סיבה עבור נושא חסוי"
 
-#: .\models.py:596
+#: .\models.py:598
 msgid "Confidential Reasons"
 msgstr "סיבות עבור נושאים חסויים"
 
-#: .\models.py:603
+#: .\models.py:605
 msgid ""
 "A reason that can be used for marking items as confidential in your "
 "community."
 msgstr "הגדרת סיבה עבור נושאים חסויים"
 
-#: .\models.py:609
+#: .\models.py:611
 msgid "The title to give this reason."
 msgstr "כותרת עבור סיבה זו"
 
-#: .\models.py:622 .\models.py:639
+#: .\models.py:624 .\models.py:641
 #: .\templates\communities\communitygrouprole_list.html:15
 msgid "Group"
 msgstr "קבוצה"
 
-#: .\models.py:623 .\templates\communities\communitygroup_detail.html:4
+#: .\models.py:625 .\templates\communities\communitygroup_detail.html:4
 #: .\templates\communities\communitygroup_list.html:10
 #: .\templates\communities\communitygroup_list.html:45
 #: .\templates\communities\communitygrouprole_list.html:4
 msgid "Groups"
 msgstr "קבוצות"
 
-#: .\models.py:640 .\templates\communities\communitygrouprole_list.html:16
+#: .\models.py:642 .\templates\communities\communitygrouprole_list.html:16
 msgid "Role"
 msgstr "הרשאות"
 
-#: .\models.py:645
+#: .\models.py:647
 msgid "Group Role"
 msgstr "קבוצת Role"
 
-#: .\models.py:646
+#: .\models.py:648
 msgid "Group Roles"
 msgstr "קבוצות Role"
 
 #: .\models.py:664
+msgid "Group, Role & Committee need to be from same community"
+msgstr "קבוצות, הרשאות וועדות צריכים להיות מאותה קהילה"
+
+#: .\models.py:678
 #: .\south_migrations\0011_auto__add_field_community_register_missing_board_members__chg_field_co.py:17
 msgid "Board"
 msgstr "ועד"
@@ -292,7 +296,6 @@ msgid "History"
 msgstr "היסטוריה"
 
 #: .\templates\_community_panel.html:35
-#: .\templates\communities\participants_form.html:193
 msgid "Members"
 msgstr "חברים"
 
@@ -662,39 +665,47 @@ msgstr "רשימה"
 msgid "List of participants"
 msgstr "רשימת משתתפים בפגישה"
 
-#: .\templates\communities\participants_form.html:39
-#: .\templates\communities\participants_form.html:205
+#: .\templates\communities\participants_form.html:31
+#: .\templates\communities\participants_form.html:137
 #: .\templates\emails\_protocol.html:65
 msgid "Guests"
 msgstr "אורחים"
 
-#: .\templates\communities\participants_form.html:113
+#: .\templates\communities\participants_form.html:49
+msgid "No members"
+msgstr "אין חברים"
+
+#: .\templates\communities\participants_form.html:63
 msgid "Delete"
 msgstr "מחק"
 
-#: .\templates\communities\participants_form.html:129
+#: .\templates\communities\participants_form.html:79
 msgid "Email"
 msgstr "אימייל"
 
-#: .\templates\communities\participants_form.html:136
-#: .\templates\communities\participants_form.html:157
+#: .\templates\communities\participants_form.html:86
+#: .\templates\communities\participants_form.html:107
 #: .\templates\communities\upcoming.html:182
 msgid "Add"
 msgstr "הוסף"
 
-#: .\templates\communities\participants_form.html:147
+#: .\templates\communities\participants_form.html:97
 msgid "Previous participants"
 msgstr "משתתפים מפגישות קודמות"
 
-#: .\templates\communities\participants_form.html:171
+#: .\templates\communities\participants_form.html:121
 msgid "Please select participants for upcoming meeting"
 msgstr "בחר משתתפים לפגישה הקרובה"
 
-#: .\templates\communities\participants_form.html:222
+#: .\templates\communities\participants_form.html:125
+msgid "Committee members"
+msgstr "חברי ועדה"
+
+#: .\templates\communities\participants_form.html:154
 msgid "Cancel"
 msgstr "ביטול"
 
-#: .\templates\communities\participants_form.html:223
+#: .\templates\communities\participants_form.html:155
 #: .\templates\communities\upcoming.html:276
 msgid "Save"
 msgstr "שמירה"
@@ -949,24 +960,24 @@ msgstr "הצבעה פעילה"
 msgid "Published"
 msgstr "פורסם"
 
-#: .\views.py:273
+#: .\views.py:279
 #, python-format
 msgid "Sending to %d users"
 msgstr "שולח ל-%d משתמשים"
 
-#: .\views.py:371
+#: .\views.py:377
 msgid "Not a valid number for page."
 msgstr "מספר עמוד לא תקין"
 
-#: .\views.py:374
+#: .\views.py:380
 msgid "Pages should be 1 or greater."
 msgstr "מספר עמוד צריך להיות 1 או יותר."
 
-#: .\views.py:383
+#: .\views.py:389
 msgid "No such page!"
 msgstr "דף לא קיים!"
 
-#: .\views.py:456 .\views.py:503
+#: .\views.py:462 .\views.py:509
 msgid "Group already exists"
 msgstr "קבוצה בשם זה כבר קיימת"
 
@@ -1113,6 +1124,3 @@ msgstr "קבוצה בשם זה כבר קיימת"
 
 #~ msgid "Is Secretary"
 #~ msgstr "מזכיר"
-
-#~ msgid "Community Members"
-#~ msgstr "חברי קהילה"
diff --git a/src/communities/locale/he/LC_MESSAGES/djangojs.mo b/src/communities/locale/he/LC_MESSAGES/djangojs.mo
index b4753b538c17b9f705cf42b091e40f4b2a265d5b..e4822164a366c26f9c6dccb9597aed479c069a01 100644
GIT binary patch
delta 21
ccmey&{F!;eYA$nKLvsZ~Ln~wRja%&)0aFDA$p8QV

delta 21
ccmey&{F!;eYA!Qf19JsKLn|Y*ja%&)0aD-w#Q*>R

diff --git a/src/communities/locale/he/LC_MESSAGES/djangojs.po b/src/communities/locale/he/LC_MESSAGES/djangojs.po
index ca350ce6..dccefe41 100644
--- a/src/communities/locale/he/LC_MESSAGES/djangojs.po
+++ b/src/communities/locale/he/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Open Community\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-07 11:26+0300\n"
+"POT-Creation-Date: 2016-07-17 11:37+0300\n"
 "PO-Revision-Date: 2014-02-11 12:50+0200\n"
 "Last-Translator: Yaniv Mirel <yanivmirel@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/communities/models.py b/src/communities/models.py
index fe7fc909..513f3791 100644
--- a/src/communities/models.py
+++ b/src/communities/models.py
@@ -4,6 +4,7 @@
 
 from acl.models import Role
 from django.conf import settings
+from django.core.exceptions import ValidationError
 from django.core.urlresolvers import reverse
 from django.db import models, transaction
 from django.db.models.signals import post_save
@@ -656,6 +657,18 @@ def __str__(self):
     def get_absolute_url(self):
         return reverse("group_role:detail", args=(self.committee.community.slug, self.pk))
 
+    def clean(self):
+        if self.group.community_id == self.role.community_id == self.committee.community_id:
+            return self
+        else:
+            raise ValidationError(_('Group, Role & Committee need to be from same community'))
+
+    def save(self, *args, **kwargs):
+        if self.group.community_id == self.role.community_id == self.committee.community_id:
+            super(CommunityGroupRole, self).save(*args, **kwargs)
+        else:
+            return
+
 
 @receiver(post_save, sender=Community)
 def set_default_confidental_reasons(sender, instance, created,
diff --git a/src/issues/locale/he/LC_MESSAGES/django.mo b/src/issues/locale/he/LC_MESSAGES/django.mo
index 6580f5afa318eefc67378f8f57cfa12af17185bc..147c8103dbd904b96b5365610635dcef8590ea8f 100644
GIT binary patch
delta 23
fcmdnyyUlmQ6>%<eT|;vPLqjWL^Ue3fZ}0&CXIuy@

delta 23
fcmdnyyUlmQ6>%;zT?2CkLqjVgv(5L!Z}0&CXEO*W

diff --git a/src/issues/locale/he/LC_MESSAGES/django.po b/src/issues/locale/he/LC_MESSAGES/django.po
index b237f874..3d4d9a56 100644
--- a/src/issues/locale/he/LC_MESSAGES/django.po
+++ b/src/issues/locale/he/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Open Community\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-07 11:26+0300\n"
+"POT-Creation-Date: 2016-07-17 11:37+0300\n"
 "PO-Revision-Date: 2015-05-14 13:18+0200\n"
 "Last-Translator: Yaniv Mirel <yanivmirel@gmail.com>\n"
 "Language-Team: \n"
diff --git a/src/issues/locale/he/LC_MESSAGES/djangojs.mo b/src/issues/locale/he/LC_MESSAGES/djangojs.mo
index c16c57633e04dec67ec3d8a382d6645d0ba966a6..5ef3da0407a59d53b70ec020489dcc648c52f8ae 100644
GIT binary patch
delta 21
ccmbQsGM8n-X)beJLvsZ~Ln~wRjaNMw0Z1<fX#fBK

delta 21
ccmbQsGM8n-X)ZHe19JsKLn|Y*jaNMw0Z0l4WdHyG

diff --git a/src/issues/locale/he/LC_MESSAGES/djangojs.po b/src/issues/locale/he/LC_MESSAGES/djangojs.po
index ab148b4d..cfbe8d88 100644
--- a/src/issues/locale/he/LC_MESSAGES/djangojs.po
+++ b/src/issues/locale/he/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Open Community\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-07 11:26+0300\n"
+"POT-Creation-Date: 2016-07-17 11:37+0300\n"
 "PO-Revision-Date: 2015-03-05 16:27+0200\n"
 "Last-Translator: Yaniv Mirel <yanivmirel@gmail.com>\n"
 "Language-Team: \n"
diff --git a/src/meetings/locale/he/LC_MESSAGES/django.mo b/src/meetings/locale/he/LC_MESSAGES/django.mo
index e15ffd5f9c982899cf00d1f92f30234a7f2d89ff..2d8d449e3a050e588952f9ba5050e473831cf490 100644
GIT binary patch
delta 22
dcmaDP_egF-6ep*-uA#Ytp`n%W=48(QtN>N92KxX2

delta 22
dcmaDP_egF-6ep*du7SCNp`n%0=48(QtN>M!2KWE~

diff --git a/src/meetings/locale/he/LC_MESSAGES/django.po b/src/meetings/locale/he/LC_MESSAGES/django.po
index 47cae5c2..5085385d 100644
--- a/src/meetings/locale/he/LC_MESSAGES/django.po
+++ b/src/meetings/locale/he/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Open Community\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-07 11:27+0300\n"
+"POT-Creation-Date: 2016-07-17 11:37+0300\n"
 "PO-Revision-Date: 2015-05-14 13:18+0200\n"
 "Last-Translator: Yaniv Mirel <yanivmirel@gmail.com>\n"
 "Language-Team: \n"
@@ -30,11 +30,11 @@ msgstr "שלח אל"
 msgid "The selected issues will be archived"
 msgstr "הנושאים המסומנים יועברו לארכיון"
 
-#: .\forms.py:42
+#: .\forms.py:38
 msgid "Issue was not modified in this meeting"
 msgstr "לא התבצעו שינויים בנושא זה במהלך הפגישה"
 
-#: .\forms.py:45
+#: .\forms.py:41
 msgid "Undecided proposals"
 msgstr "הצעות ללא החלטה"
 
diff --git a/src/ocd/locale/he/LC_MESSAGES/django.mo b/src/ocd/locale/he/LC_MESSAGES/django.mo
index d600da8ef86af3973c3b76be331c200995af0d73..be67920cebea7d0652ab860cccaa55e540e0b018 100644
GIT binary patch
delta 22
dcmeA*=r!1&z{hE>YiO=uXlP};S(EPxCjdqI1@r&_

delta 22
dcmeA*=r!1&z{hE(YhbQmXlP}$S(EPxCjdp-1@Qm?

diff --git a/src/ocd/locale/he/LC_MESSAGES/django.po b/src/ocd/locale/he/LC_MESSAGES/django.po
index 2e838be8..c5744110 100644
--- a/src/ocd/locale/he/LC_MESSAGES/django.po
+++ b/src/ocd/locale/he/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Open Community\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-07 11:27+0300\n"
+"POT-Creation-Date: 2016-07-17 11:37+0300\n"
 "PO-Revision-Date: 2015-06-17 21:56+0200\n"
 "Last-Translator: Yaniv Mirel <yanivmirel@gmail.com>\n"
 "Language-Team: \n"
diff --git a/src/users/admin.py b/src/users/admin.py
index 4735c667..18d2c8a7 100644
--- a/src/users/admin.py
+++ b/src/users/admin.py
@@ -1,3 +1,4 @@
+from communities.models import CommunityGroupRole
 from django import forms
 from django.utils.translation import ugettext, ugettext_lazy as _
 from django.contrib import admin
@@ -79,8 +80,8 @@ class OCUserAdmin(UserAdmin):
     # The fields to be used in displaying the User model.
     # These override the definitions on the base UserAdmin
     # that reference specific fields on auth.User.
-    list_display = ('email', 'display_name', 'is_staff', 'is_superuser')
-    list_filter = ('is_staff', 'is_superuser',)
+    list_display = ('email', 'display_name', 'get_groups')
+    list_filter = ()
     fieldsets = (
         (None, {'fields': ('email', 'password', 'is_active')}),
         ('Personal info', {'fields': ('display_name',)}),
@@ -99,6 +100,15 @@ class OCUserAdmin(UserAdmin):
 
     inlines = [UserMembershipInline]
 
+    def get_groups(self, obj):
+        memberships = obj.memberships.all().values_list('group_name_id', flat=True)
+        groups = CommunityGroupRole.objects.filter(group_id__in=memberships)
+        l = []
+        for g in groups:
+            l.append(u'{0}: {1}'.format(g.group.title, g.committee.name))
+        return " | ".join(l)
+    get_groups.short_description = _('Committee & Groups')
+
 
 admin.site.register(OCUser, OCUserAdmin)
 admin.site.unregister(Group)
diff --git a/src/users/locale/he/LC_MESSAGES/django.mo b/src/users/locale/he/LC_MESSAGES/django.mo
index 8d030c1fda695ab65913ecff33c24473b593132f..da7622d187491d7c7a5a9692bc3b13717152c193 100644
GIT binary patch
delta 2379
zcmY+_du$X{6vy#XO0_MpY-@`av<!%}mM-0GSqhcf<z-t@s0-36SX*Inn<y)`_74bd
zOjAi9)W@=bQU5Uw8c0n{<0A&2Xo4CeA*P!c(KI2(Xo#BXKcb1>-}Lf_H+$~q&U9w(
znR92RM_Vqoq<<)#nKfFHxS80QZ*~M<xsHx@zR>Ij`~s`+5?+r5MP?;92j}2I)cz38
z#VAH`BXUVQfVyNFb^Noqm`yvzpnx6kVkv%r{Okf<5WhoB^efKBf3X;g>0~*bF6`lI
zta97EsOu(i7VdTX_oEVe2CJFhh8Za1H&G{ii2Up`I$ii1w|@fXvHd+Np(*5N1zddr
z22lyuq9$yn)A{YFJMKUo-|g(fdCYGE3})gHR07YVPB@Obz$j|sGpG`O>iiOQ-bD;x
z4mH6~s09B&ewI(!D4Na1+pz*exE|BGz&-}bd=NF^A!M0t1k3S+a}1ThIqb%-P{-Af
zEkkR-;}}DomqRV-6;vY1Qi;x{)4U4;)L$3$*r5wl<06cr66wTB>_%1QAO`ZxhA_nT
zi>zB6evG>F-?0L(q9!QkuIA%>Y{Mv);nP@+nIQGo0cY8v66H{tPNF8ff+TNKsD$#U
z>ryO4U7!w^U>E8J4x%PLj5_~0JV3%()I24;N;O!Es$6H9flAebH{u{_q7hW-vKYrV
zP?frhy3>4agP{db6<Ul+U@fWwn^DIlk-4oOb^Nf~ehD>i`V0ep_6eO%m_QFFQHjjp
zC}moNDs`#bUWfYoCTznvDv_5_*LfdxL!YA(yM(&VFX-VE@=IG8kG4*zL4AOts8YpI
zCq9lkaX+%GHiY~vL&pciPNR<h8g=~7sO$ZO5mXl1uE$%j*=_IeW&QUs(3<T-m1q#P
z=7;enJc+uqx7^<^pguI0aRpX#kS5-WDt!<738N++LhjT?P>GHrr`kuD()*udpaWYu
zTL;E5he@{`<17xb?Wn(}PzepACK^S4Hb$q1_dG7gZ&8Wm^L1K=LDcpde2j;(9n&@J
zc!#>{gh|vI2dR@XjG+?i!gaU{58)}i4VRNe3vNRXkD;E4w^5Zii%M_;RoNfi-=|QO
z`@53$*Pw2p*(%(Px|3H?6TgSN>UIuE*l#V)yKxQi2yvI&w;lCN=-Z$~ltd%3lhBQ+
z>4w_~RrEpT_g@eFL%5S@Cv>Npw3AS|)$S)ABFMvU-Sqbms#*`RlHi50&4ik6rj=N)
z4cAn$YGMQ75vs7}w>^Z)qo$8gm}nrXh*}~^^b%^jrt$j+=ywqMrmL}fwu$hcdhMV!
zP2;aStLA^a+%DV5AYD&)2eF7~ChjHl5X~U?==tqd`VKeV=H%`2Uq?My`Y>socN6+p
zX-St5YHNx6{Lyr$uVTz?Z{eA?gxe5W`)ln{22n!KfttRCJU8|*q1Saaq1SXP!Grw2
z)|DA6{3p;iFpx-iOTE@7Q%^n7KR#MiQCQy?iZptWNK-@OvT#E<T->oG6i*EH_4lRr
zhBovLB$~YXaAajDeC@au;mmI(f99<kzg!y2E6e6y%Vl!e+-Z;Q_1p{er^YMGQnUU8
D{D0Hk

delta 2296
zcmYk-eP~r>9Ki8swsf1_&An#6%)6Gg)~@bu-I*)5m1$cmSKC_4%xQB@ZS+D!RMwUJ
zBcmeLuq=cHCH>JbWz;`XgtQPO66wW)iYS8ymO;ZnrM}<0Gw9*`&gXf~ea?A)=Q+<g
z_hj=c&FLSDviAncAhC$(z9fVf@#Wd<D2H-FD8|Eh4Nl-3JcETeg)y9yJAJ$q3urIK
z6ef^MhJN&tgJ}PU@yZa=VJDSKIWUTB;Q+gN_yIb=r+68j#60{dauU7Z6t2VzQM-Xo
zUT+o7#nouP4m6P-tittJ!1!S|6;BvJw(ur9Pk1*v{yvt`K8z-G4B5i>>=xo_G~p~p
zbHE~Yo?njM=~A?RePk1Qy*A8d{IH3N2@IeoJcM50DYWA*bjsg|9K~$f?_oZUp#vO2
z6Z{<6!YOu4O86D8#Xm5C^O;W1UyEroZ>Qpb8<58t`mq#;BA-VS*oPbOZM5IN$QE+Q
z`gJTt&l|%cJc=grHJa$p=)h;u>rKU&e=l&60~MG@FB7T3a;!&ZrW5nCLg>W=?Lk)9
za@>pF`2=2pC(r>VaRL5`t(eDMmS7k9?6;x656@%%ouV-gnCVC8fJc#>!Z9?VZ}4jT
z0lh#r^L!O1&>QGP2kt}9--6GO@D6mK-<XbS%;HsY=4#NHN~Nh>PNf|ks2`oW9oUJ_
zqEmGOz0*_37Jgyp44p$0DC740y%HHSEJORXMD1>Lz^%v@cCxd7dYDR_%6>F~kI@W2
z!{zuz)V>(~KAWqway*76(1Tv+3G_yGp$Y9nuX6z7co5mbm+b6+8u{L&!&xd$QH-VT
ziB;%{Ddh2mCS(ii*zv&#18Dy}X#aQ63m(EG9*Np#a53$FqIMbC*{=e9R5e)a`=6xZ
zvtEPqu?xMkp-hJmUP3=Gqj)`jhYp-iXBXW<%p{Bs(1hM;8=7bza!Pm_AHmnqezQ2a
z)b~F|<y)-u0G>zsghI}?U5zHxf)3P&Y+)Na7wv9bhOeTDeS+8F@u+<chggi+e66ZE
z{uuLa|NYLt&-geMGdz!GR?NKJg5~%EZpNkfJ2qnh*~GB}T{Dj&Ifp0F1c%YZ_g3`#
zL3HLmjGV+9XfIj9{F7YhT{1oJ<H#!>o<kDOEI`N<S9K%dK${55hH1hbcxP0X+X)l6
zkMOmvA}Wb~g0VAyWZY}m;`6VdvWl>H*OuD|7u)}fQ|c>e@sETYGwZ_kJ?<#YL>IAw
za3*|=4a7{Tr&1F&;yA$gnd0}kmv~^h8D`=7s4jJcQ~e;Zj&P;lOIT6_Z)c{ovfoT}
z5PsM!{z<tmEVYDh)moyRNVl=G_)7E;t^+?n-NYc_SI)P?=jE4eruaNr4w=W7z`KZz
zL=$0gp=~AjV1}EC7UEXIkJ(JQ-|jBB)kGh06X8O0)w@Dn3pWxoWet_P30FO@HUHTY
zITyyi$}P#sZAjFvh$oYcbt8WjE{dfR$=XC+GG4o~v94icLDAn?squp1maOsZCEMrz
E2N2V^(f|Me

diff --git a/src/users/locale/he/LC_MESSAGES/django.po b/src/users/locale/he/LC_MESSAGES/django.po
index 18d359eb..0abd2617 100644
--- a/src/users/locale/he/LC_MESSAGES/django.po
+++ b/src/users/locale/he/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Open Community\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-07 11:27+0300\n"
-"PO-Revision-Date: 2015-10-21 09:26+0300\n"
+"POT-Creation-Date: 2016-07-17 11:37+0300\n"
+"PO-Revision-Date: 2016-07-17 11:40+0300\n"
 "Last-Translator: Yaniv Mirel <yanivmirel@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.5\n"
+"X-Generator: Poedit 1.8.8\n"
 
-#: .\admin.py:42 .\forms.py:45
+#: .\admin.py:43 .\forms.py:58
 msgid "Password"
 msgstr "סיסמא"
 
-#: .\admin.py:43
+#: .\admin.py:44
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -31,155 +31,171 @@ msgstr ""
 "סיסמאות אינם נשמרות כטקסט, אז אין אפשרות לראות את הסיסמא של המשתמש, אבל ניתן "
 "לשנות סיסמא בעזרת <a href=\"password/\">הקישור הזה</a>."
 
+#: .\admin.py:110
+msgid "Committee & Groups"
+msgstr "ועדות וקבוצות"
+
 #: .\apps.py:8
 msgid "Users, memberships & rolls"
 msgstr "משתמשים, חברי קהילה, תפקידים והזמנות"
 
-#: .\forms.py:14
+#: .\forms.py:11
 #, python-format
 msgid ""
 "Please enter a correct %(username)s and password. Note that both fields may "
 "be case-sensitive."
 msgstr "אנא הכנס %(username)s וסיסמא תיקניים. שים לב לאותיות קטנות וגדולות."
 
-#: .\forms.py:46
+#: .\forms.py:38 .\tests\invitation_test.py:99 .\views.py:38
+msgid "This user already a member of this community."
+msgstr "משתמש זה כבר חבר בקהילה"
+
+#: .\forms.py:40 .\tests\invitation_test.py:89 .\views.py:41
+msgid "This user is already invited to this community."
+msgstr "משתמש זה כבר הוזמן לקהילה"
+
+#: .\forms.py:48 .\tests\invitation_test.py:80 .\views.py:70 .\views.py:396
+msgid "Form error. Please supply a valid email."
+msgstr "יש בעיה בטופס. אנא בדוק את כתובת האימייל"
+
+#: .\forms.py:59
 msgid "Password confirmation"
 msgstr "אימות סיסמא"
 
-#: .\forms.py:60
+#: .\forms.py:73
 msgid "Passwords don't match"
 msgstr "סיסמא לא תואמת"
 
-#: .\forms.py:103
+#: .\forms.py:116
 msgid "Upload CSV file to import"
 msgstr "העלאת קובץ csv"
 
-#: .\forms.py:107
+#: .\forms.py:120
 msgid "Choose groups"
 msgstr "בחר קבוצות"
 
-#: .\models.py:69
+#: .\models.py:70
 msgid "email address"
 msgstr "כתובת דואל"
 
-#: .\models.py:72
+#: .\models.py:73
 msgid "Your name"
 msgstr "שמך"
 
-#: .\models.py:74
+#: .\models.py:75
 msgid "staff status"
 msgstr "חבר בצוות האתר"
 
-#: .\models.py:75
+#: .\models.py:76
 msgid "Designates whether the user can log into this admin site."
 msgstr "יכול להכנס לאדמין"
 
-#: .\models.py:77
+#: .\models.py:78
 msgid "date joined"
 msgstr "תאריך הצטרפות"
 
-#: .\models.py:85
+#: .\models.py:86
 msgid "user"
 msgstr "משתמש"
 
-#: .\models.py:86
+#: .\models.py:87
 msgid "users"
 msgstr "משתמשים"
 
-#: .\models.py:124 .\models.py:269
+#: .\models.py:125 .\models.py:272
 msgid "Community"
 msgstr "קהילה"
 
-#: .\models.py:125 .\models.py:284
+#: .\models.py:127 .\models.py:287
 msgid "User"
 msgstr "משתמש"
 
-#: .\models.py:126 .\models.py:291 .\models.py:294
+#: .\models.py:128 .\models.py:294 .\models.py:297
 #: .\templates\users\member_update_form.html:9
 msgid "Group"
 msgstr "קבוצה"
 
-#: .\models.py:127
+#: .\models.py:130
 msgid "Old group"
 msgstr "קבוצה ישנה"
 
-#: .\models.py:129 .\models.py:272
+#: .\models.py:132 .\models.py:275
 msgid "Created at"
 msgstr "נוצר בתאריך"
 
-#: .\models.py:132
+#: .\models.py:135
 msgid "Invited by"
 msgstr "הוזמן על ידי"
 
-#: .\models.py:135
+#: .\models.py:138
 msgid "In position since"
 msgstr "מכהן מתאריך"
 
-#: .\models.py:140
+#: .\models.py:143
 msgid "Community Member"
 msgstr "חבר קהילה"
 
-#: .\models.py:141
+#: .\models.py:144
 msgid "Community Members"
 msgstr "חברי קהילה"
 
-#: .\models.py:259
+#: .\models.py:262
 msgid "Pending"
 msgstr "ממתין למשלוח"
 
-#: .\models.py:260
+#: .\models.py:263
 msgid "Sent"
 msgstr "נשלח"
 
-#: .\models.py:261
+#: .\models.py:264
 msgid "Failed"
 msgstr "נכשל"
 
-#: .\models.py:275
+#: .\models.py:278
 msgid "Created by"
 msgstr "נוצר על ידי"
 
-#: .\models.py:278
+#: .\models.py:281
 msgid "Name"
 msgstr "שם"
 
-#: .\models.py:279 .\templates\users\member_profile.html:24
+#: .\models.py:282 .\templates\users\member_profile.html:24
 msgid "Email"
 msgstr "דואל"
 
-#: .\models.py:280
+#: .\models.py:283
 msgid "Message"
 msgstr "הודעה"
 
-#: .\models.py:287
+#: .\models.py:290
 msgid "Groups"
 msgstr "קבוצות"
 
-#: .\models.py:297
+#: .\models.py:300
 msgid "Status"
 msgstr "סטאטוס"
 
-#: .\models.py:299
+#: .\models.py:302
 msgid "Times Sent"
 msgstr "מספר הפעמים שההזמנה נשלחה"
 
-#: .\models.py:300
+#: .\models.py:303
 msgid "Error count"
 msgstr "מספר הפעימים שהמשלוח נכשל"
 
-#: .\models.py:301
+#: .\models.py:304
 msgid "Sent at"
 msgstr "נשלח לאחרונה ב"
 
-#: .\models.py:306
+#: .\models.py:309
 msgid "Invitation"
 msgstr "הזמנה"
 
-#: .\models.py:307
+#: .\models.py:310
 msgid "Invitations"
 msgstr "הזמנות"
 
-#: .\models.py:309
+#: .\models.py:312
 #, python-format
 msgid ""
 "The system will allow you to take part in the decision making process of %s. "
@@ -191,7 +207,7 @@ msgstr ""
 "אחרי אישור ההצטרפות ניתן לראות את הנושאים לדיון, את סדר היום לישיבה הקרובה, "
 "ואת סיכום ההחלטות מהישיבות הקודמות, ובעתיד ניתן יהיה גם לדון ולהשפיע עליהם."
 
-#: .\models.py:324
+#: .\models.py:327
 #, python-format
 msgid "Invitation to %s"
 msgstr "הזמנה לקהילה %s"
@@ -435,27 +451,15 @@ msgstr "הזמן"
 msgid "Open invitations"
 msgstr "הזמנות פתוחות"
 
-#: .\tests\invitation_test.py:80 .\views.py:74 .\views.py:398 .\views.py:493
-msgid "Form error. Please supply a valid email."
-msgstr "יש בעיה בטופס. אנא בדוק את כתובת האימייל"
-
-#: .\tests\invitation_test.py:89 .\views.py:45
-msgid "This user is already invited to this community."
-msgstr "משתמש זה כבר הוזמן לקהילה"
-
-#: .\tests\invitation_test.py:99 .\views.py:40
-msgid "This user already a member of this community."
-msgstr "משתמש זה כבר חבר בקהילה"
-
-#: .\views.py:149
+#: .\views.py:145
 msgid "member"
 msgstr "חבר"
 
-#: .\views.py:178
+#: .\views.py:176
 msgid "Oops. Something went wrong. Please try again."
 msgstr "אופס. משהו השתבש. אנה נסה שוב."
 
-#: .\views.py:315
+#: .\views.py:313
 #, python-format
 msgid "%d Invitations sent"
 msgstr "%d הזמנות נשלחו"