Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
campaign
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
La Quadrature du Net
piphone
campaign
Commits
bc894a51
Commit
bc894a51
authored
Aug 06, 2016
by
Porkepix
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into 4-tests-are-failing
parents
4169e73f
cbf36c56
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
101 deletions
+10
-101
picampaign/campaign/models.py
picampaign/campaign/models.py
+2
-2
picampaign/campaign/tests.py
picampaign/campaign/tests.py
+1
-92
picampaign/contact/models.py
picampaign/contact/models.py
+2
-2
picampaign/feedback/models.py
picampaign/feedback/models.py
+1
-1
picampaign/organization/models.py
picampaign/organization/models.py
+4
-4
No files found.
picampaign/campaign/models.py
View file @
bc894a51
...
...
@@ -21,7 +21,7 @@ class Campaign(models.Model):
choices
=
LANGUAGES
,
verbose_name
=
_
(
'language'
))
def
__
unicode
__
(
self
):
def
__
str
__
(
self
):
return
self
.
title
.
decode
(
'utf-8'
)
...
...
@@ -34,7 +34,7 @@ class Argumentary(models.Model):
verbose_name
=
_
(
'language'
))
text
=
models
.
TextField
(
null
=
True
)
def
__
unicode
__
(
self
):
def
__
str
__
(
self
):
args
=
{
'lang'
:
self
.
lang
,
'title'
:
self
.
campaign
.
title
}
return
_
(
'Argumentary in %(lang)s for %(title)s'
)
%
args
...
...
picampaign/campaign/tests.py
View file @
bc894a51
from
django.conf
import
settings
from
django.test
import
TestCase
from
picampaign.campaign.models
import
Campaign
,
Argumentary
,
CampaignContact
from
picampaign.campaign.models
import
Campaign
,
CampaignContact
from
picampaign.contact.models
import
Contact
class
CampaignMethodTests
(
TestCase
):
def
test_unicode_is_title
(
self
):
campaign
=
Campaign
(
title
=
'Campaign Title'
,
start_date
=
'2000-01-01'
,
end_date
=
'2100-12-31'
)
self
.
assertEqual
(
campaign
.
__unicode__
(),
'Campaign Title'
)
def
test_unicode_is_unicode
(
self
):
campaign
=
Campaign
(
title
=
'Campaign Title'
,
start_date
=
'2000-01-01'
,
end_date
=
'2100-12-31'
)
self
.
assertEqual
(
str
(
type
(
campaign
.
__unicode__
())),
"<type 'unicode'>"
)
class
ArgumentaryMethodTests
(
TestCase
):
def
test_unicode_is_title
(
self
):
campaign
=
Campaign
(
title
=
'Campaign Title'
,
start_date
=
'2000-01-01'
,
end_date
=
'2100-12-31'
)
argumentary
=
Argumentary
(
campaign
=
campaign
,
lang
=
'en'
)
self
.
assertEqual
(
argumentary
.
__unicode__
(),
"Argumentary in en for Campaign Title"
)
def
test_unicode_is_unicode
(
self
):
campaign
=
Campaign
(
title
=
'Campaign Title'
,
start_date
=
'2000-01-01'
,
end_date
=
'2100-12-31'
)
argumentary
=
Argumentary
(
campaign
=
campaign
,
lang
=
'en'
)
self
.
assertEqual
(
str
(
type
(
argumentary
.
__unicode__
())),
"<type 'unicode'>"
)
class
CampaignContactMethodTests
(
TestCase
):
def
test_unicode_is_contact_and_title
(
self
):
campaign
=
Campaign
(
title
=
'Campaign Title'
,
start_date
=
'2000-01-01'
,
end_date
=
'2100-12-31'
)
contact
=
Contact
(
first_name
=
'Victor'
,
last_name
=
'Hugo'
,
phone
=
'+3312345678'
)
campaigncontact
=
CampaignContact
(
campaign
=
campaign
,
contact
=
contact
)
self
.
assertEqual
(
campaigncontact
.
__unicode__
(),
"Contact Victor Hugo on Campaign Title"
)
def
test_unicode_is_unicode
(
self
):
campaign
=
Campaign
(
title
=
'Campaign Title'
,
start_date
=
'2000-01-01'
,
end_date
=
'2100-12-31'
)
contact
=
Contact
(
first_name
=
'Victor'
,
last_name
=
'Hugo'
,
phone
=
'+3312345678'
)
campaigncontact
=
CampaignContact
(
campaign
=
campaign
,
contact
=
contact
)
self
.
assertEqual
(
str
(
campaigncontact
),
"Contact Contact object on Campaign Title"
)
def
test_all_groups_is_empty
(
self
):
campaign
=
Campaign
(
title
=
'Campaign Title'
,
...
...
picampaign/contact/models.py
View file @
bc894a51
...
...
@@ -12,7 +12,7 @@ class Contact(models.Model):
mail
=
models
.
CharField
(
max_length
=
255
,
blank
=
True
)
photo
=
models
.
ImageField
(
upload_to
=
'contacts/photos'
,
blank
=
True
)
def
__
unicode
__
(
self
):
def
__
str
__
(
self
):
return
_
(
u
'%(firstname)s %(lastname)s'
)
%
{
'firstname'
:
self
.
first_name
,
'lastname'
:
self
.
last_name
}
...
...
@@ -24,5 +24,5 @@ class Contact(models.Model):
def
get_photo_url
(
self
):
if
self
.
photo
:
return
self
.
photo
.
url
return
u
''
return
''
picampaign/feedback/models.py
View file @
bc894a51
...
...
@@ -10,7 +10,7 @@ class Feedback(models.Model):
category
=
models
.
ForeignKey
(
FeedbackCategory
)
comment
=
models
.
CharField
(
max_length
=
512
,
blank
=
True
)
def
__
unicode
__
(
self
):
def
__
str
__
(
self
):
return
_
(
'feedback for %(callee contact)s on %(campaign title)s'
)
%
\
{
'callee contact'
:
self
.
callee
.
contact
,
'campaign title'
:
self
.
callee
.
campaign
.
title
}
picampaign/organization/models.py
View file @
bc894a51
...
...
@@ -10,7 +10,7 @@ class Organization(models.Model):
users
=
models
.
ManyToManyField
(
User
,
null
=
True
,
blank
=
True
,
related_name
=
'organizations'
)
def
__
unicode
__
(
self
):
def
__
str
__
(
self
):
return
self
.
name
...
...
@@ -19,7 +19,7 @@ class GroupType(models.Model):
organization
=
models
.
ForeignKey
(
Organization
)
name
=
models
.
CharField
(
max_length
=
64
)
def
__
unicode
__
(
self
):
def
__
str
__
(
self
):
return
self
.
name
...
...
@@ -33,7 +33,7 @@ class Group(models.Model):
contacts
=
models
.
ManyToManyField
(
Contact
,
null
=
True
,
blank
=
True
,
related_name
=
'groups'
)
def
__
unicode
__
(
self
):
def
__
str
__
(
self
):
return
self
.
name
...
...
@@ -42,5 +42,5 @@ class FeedbackCategory(models.Model):
name
=
models
.
CharField
(
max_length
=
64
)
organization
=
models
.
ForeignKey
(
Organization
)
def
__
unicode
__
(
self
):
def
__
str
__
(
self
):
return
self
.
name
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment