Fixes issues #56 and #58: Introducing NullBooleanField in Django 1.1 raised a validation error in Jutda Helpdesk due to us relying on a bug (oops!).

This commit is contained in:
Ross Poulton 2009-05-24 05:26:12 +00:00
parent 9e13b42a4d
commit f2009c687f
2 changed files with 43 additions and 8 deletions

View File

@ -221,3 +221,39 @@ textarea#commentBox {
font-size: 0.8em; font-size: 0.8em;
clear: both; clear: both;
} }
span.priority1, span.priority2, span.priority3, span.priority4, span.priority5 {
padding: 1px 12px;
font-weight: bold;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
margin: 2px;
display: block;
text-align: center;
width: 20px;
}
span.priority1 {
background-color: #c00;
color: #fff;
}
span.priority2 {
background-color: #e80;
color: #fff;
}
span.priority3 {
background-color: #fe8;
color: #000;
}
span.priority4 {
background-color: #59c;
color: #fff;
}
span.priority5 {
background-color: #8c5;
color: #fff;
}

View File

@ -56,7 +56,7 @@ class Queue(models.Model):
allow_public_submission = models.BooleanField( allow_public_submission = models.BooleanField(
_('Allow Public Submission?'), _('Allow Public Submission?'),
blank=True, blank=True,
null=True, default=False,
help_text=_('Should this queue be listed on the public submission ' help_text=_('Should this queue be listed on the public submission '
'form?'), 'form?'),
) )
@ -64,7 +64,7 @@ class Queue(models.Model):
allow_email_submission = models.BooleanField( allow_email_submission = models.BooleanField(
_('Allow E-Mail Submission?'), _('Allow E-Mail Submission?'),
blank=True, blank=True,
null=True, default=False,
help_text=_('Do you want to poll the e-mail box below for new ' help_text=_('Do you want to poll the e-mail box below for new '
'tickets?'), 'tickets?'),
) )
@ -125,7 +125,7 @@ class Queue(models.Model):
email_box_ssl = models.BooleanField( email_box_ssl = models.BooleanField(
_('Use SSL for E-Mail?'), _('Use SSL for E-Mail?'),
blank=True, blank=True,
null=True, default=False,
help_text=_('Whether to use SSL for IMAP or POP3 - the default ports ' help_text=_('Whether to use SSL for IMAP or POP3 - the default ports '
'when using SSL are 993 for IMAP and 995 for POP3.'), 'when using SSL are 993 for IMAP and 995 for POP3.'),
) )
@ -286,7 +286,7 @@ class Ticket(models.Model):
on_hold = models.BooleanField( on_hold = models.BooleanField(
_('On Hold'), _('On Hold'),
blank=True, blank=True,
null=True, default=False,
help_text=_('If a ticket is on hold, it will not automatically be ' help_text=_('If a ticket is on hold, it will not automatically be '
'escalated.'), 'escalated.'),
) )
@ -466,7 +466,7 @@ class FollowUp(models.Model):
public = models.BooleanField( public = models.BooleanField(
_('Public'), _('Public'),
blank=True, blank=True,
null=True, default=False,
help_text=_('Public tickets are viewable by the submitter and all ' help_text=_('Public tickets are viewable by the submitter and all '
'staff, but non-public tickets can only be seen by staff.'), 'staff, but non-public tickets can only be seen by staff.'),
) )
@ -839,9 +839,8 @@ class SavedSearch(models.Model):
shared = models.BooleanField( shared = models.BooleanField(
_('Shared With Other Users?'), _('Shared With Other Users?'),
default=False,
blank=True, blank=True,
null=True, default=False,
help_text=_('Should other users see this query?'), help_text=_('Should other users see this query?'),
) )
@ -964,7 +963,7 @@ class IgnoreEmail(models.Model):
keep_in_mailbox = models.BooleanField( keep_in_mailbox = models.BooleanField(
_('Save Emails in Mailbox?'), _('Save Emails in Mailbox?'),
blank=True, blank=True,
null=True, default=False,
help_text=_('Do you want to save emails from this address in the ' help_text=_('Do you want to save emails from this address in the '
'mailbox? If this is unticked, emails from this address will ' 'mailbox? If this is unticked, emails from this address will '
'be deleted.'), 'be deleted.'),