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

[Adnane Belmadiaf]

Fixed the tests

=== modified file '.bzrignore'
--- .bzrignore	2012-11-12 20:25:25 +0000
+++ .bzrignore	2012-12-26 22:47:22 +0000
@@ -2,7 +2,7 @@
 .pydevproject
 *.pyc
 loco_directory/lp_data
-loco_directory/loco_directory.db
+loco_directory/ltp.db
 *.mo
 loco_directory/media/jquery
 loco_directory/media/jquery-ui

=== added file 'loco_directory/events/fields.py'
--- loco_directory/events/fields.py	1970-01-01 00:00:00 +0000
+++ loco_directory/events/fields.py	2012-12-26 22:47:22 +0000
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from django.db.models import PositiveSmallIntegerField
+
+
+class GuestsField(PositiveSmallIntegerField):
+    """
+    PositiveSmallIntegerField with a max_value of 100.
+    """
+
+    def get_internal_type(self):
+        return "PositiveSmallIntegerField"
+
+    def formfield(self, **kwargs):
+        """
+        Set maximum value in *formfield* to 100.
+        """
+        defaults = {'min_value': 0, 'max_value': 100}
+        defaults.update(kwargs)
+        return super(PositiveSmallIntegerField, self).formfield(**defaults)

=== modified file 'loco_directory/events/forms.py'
--- loco_directory/events/forms.py	2012-12-04 22:17:11 +0000
+++ loco_directory/events/forms.py	2012-12-26 22:47:22 +0000
@@ -171,11 +171,6 @@
     """
     a form to create/update an Attendee object
     """
-    def __init__(self, *args, **kargs):
-        super(AttendeeRegistrationForm, self).__init__(*args, **kargs)
-        self.fields['guests'].min_value = 0
-        self.fields['guests'].max_value = 100
-
     class Meta:
         model = Attendee
         exclude = ('attendee_profile', 'team_event')

=== modified file 'loco_directory/events/models.py'
--- loco_directory/events/models.py	2012-12-22 15:14:15 +0000
+++ loco_directory/events/models.py	2012-12-26 22:47:22 +0000
@@ -10,6 +10,7 @@
 from common.mixins import LocalTimeMixin
 
 from .managers import GlobalEventManager, TeamEventManager
+from .fields import GuestsField
 
 ATTENDEE_PROMISE_CHOICES = (
     ('sure', _('attending')),
@@ -213,7 +214,7 @@
     team_event = models.ForeignKey(TeamEvent, help_text=_('the Team Event'))
     attendee_profile = models.ForeignKey(UserProfile, help_text=_('the name of the attendee'), null=True)
     promise = models.CharField(verbose_name=_('Attending Status'), max_length=50, choices=ATTENDEE_PROMISE_CHOICES)
-    guests = models.PositiveSmallIntegerField(verbose_name=_('Additional Guests'))
+    guests = GuestsField(verbose_name=_('Additional Guests'))
 
     class Meta:
         unique_together = ('team_event', 'attendee_profile')

=== modified file 'puppet/manifests/classes/ltp.pp'
--- puppet/manifests/classes/ltp.pp	2012-12-24 21:17:36 +0000
+++ puppet/manifests/classes/ltp.pp	2012-12-26 22:47:22 +0000
@@ -11,8 +11,8 @@
     exec {
         "db_download":
             cwd => "$PROJ_DIR/loco_directory",
-            command => "/usr/bin/wget http://people.ubuntu.com/~daker/ltp/loco_directory.db",
-            creates => "$PROJ_DIR/loco_directory/loco_directory.db";
+            command => "/usr/bin/wget http://people.ubuntu.com/~daker/ltp/loco_directory.db ltp.db",
+            creates => "$PROJ_DIR/loco_directory/ltp.db";
     }
 
     exec {