Merge lp:~daker/loco-team-portal/fix.1273491 into lp:loco-team-portal

[Adnane Belmadiaf]

Fixed merge functionnality

[lp:~daker/loco-team-portal/fix.1273491]

683. By Adnane Belmadiaf on 2014-08-04

Fixed icons

684. By Adnane Belmadiaf on 2014-08-04

Fixes

[Pablo Rubianes (pablorubianes-uy)]

Approved in order to merge

review: Approve

[Lucy Llewellyn (lucyllewy)]

the change to loco_directory/media/css/styles.css appears unrelated. This should be backed-out leaving just the changes in loco_directory/teams/utils.py for this merge to proceed.

review: Needs Fixing

Unmerged revisions

684. By Adnane Belmadiaf on 2014-08-04

Fixes

683. By Adnane Belmadiaf on 2014-08-04

Fixed icons

682. By Adnane Belmadiaf on 2014-08-04

Fixed merge functionnality

=== modified file 'loco_directory/media/css/styles.css'
--- loco_directory/media/css/styles.css	2013-10-30 00:31:14 +0000
+++ loco_directory/media/css/styles.css	2014-08-04 21:57:04 +0000
@@ -1603,7 +1603,6 @@
     width: 20px;
     height: 20px;
     display: inline-block;
-    top: -10px;
 }
 
 .pictogram-l {

=== modified file 'loco_directory/teams/utils.py'
--- loco_directory/teams/utils.py	2012-12-25 22:00:46 +0000
+++ loco_directory/teams/utils.py	2014-08-04 21:57:04 +0000
@@ -1,17 +1,35 @@
 from django.utils.translation import ugettext
 
 from events.models import TeamEvent
+from meetings.models import TeamMeeting
+from articles.models import Feed
 
 
 def merge_teams(old_team, new_team):
     msgs = []
     related_events = TeamEvent.objects.filter(teams__id=old_team.id)
+
     for event in related_events:
         for team in event.teams.filter(id=old_team.id):
             msgs += [ugettext('New owner of event "%(event)s" is team "%(team)s".' % {'event':event.name, 'team':new_team.name})]
             event.teams.remove(team)
             event.teams.add(new_team)
         event.save()
+
+    related_meetings = TeamMeeting.objects.filter(teams__id=old_team.id)
+    for meeting in related_meetings:
+        for team in meeting.teams.filter(id=old_team.id):
+            msgs += [ugettext('New owner of meeting "%(meeting)s" is team "%(team)s".' % {'meeting':meeting.name, 'team':new_team.name})]
+            meeting.teams.remove(team)
+            meeting.teams.add(new_team)
+        meeting.save()
+
+    related_feeds = Feed.objects.filter(team__id=old_team.id)
+    for feed in related_feeds:
+        msgs += [ugettext('New owner of feed "%(feed)s" is team "%(team)s".' % {'feed':feed.title, 'team':new_team.name})]
+        feed.team = new_team
+        feed.save()
+
     if old_team.contact_profiles.count() and not new_team.contact_profiles.count():
         for contact_profile in old_team.contact_profiles.all():
             new_team.contact_profiles.add(contact_profile)