Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Political Memory
memopol
Commits
a8eeff9f
Commit
a8eeff9f
authored
Dec 28, 2015
by
Jamesie Pic
Browse files
Bugfix: Position form would only work in best case
parent
e1e714be
Changes
6
Hide whitespace changes
Inline
Side-by-side
memopol/views.py
View file @
a8eeff9f
...
...
@@ -28,7 +28,8 @@ class RepresentativeDetail(representatives_views.RepresentativeDetail):
def
get_context_data
(
self
,
**
kwargs
):
c
=
super
(
RepresentativeDetail
,
self
).
get_context_data
(
**
kwargs
)
c
[
'position_form'
]
=
PositionForm
()
c
[
'position_form'
]
=
PositionForm
(
initial
=
{
'representative'
:
self
.
object
.
pk
})
self
.
add_representative_country_and_main_mandate
(
c
[
'object'
])
return
c
...
...
representatives_positions/forms.py
View file @
a8eeff9f
...
...
@@ -8,7 +8,7 @@ from .models import Position
class
PositionForm
(
forms
.
ModelForm
):
class
Meta
:
model
=
Position
fields
=
[
'tags'
,
'datetime'
,
'text'
,
'link'
]
fields
=
[
'tags'
,
'datetime'
,
'text'
,
'link'
,
'representative'
]
widgets
=
{
# Use localization and bootstrap 3
'datetime'
:
DateWidget
(
...
...
@@ -17,5 +17,6 @@ class PositionForm(forms.ModelForm):
},
usel10n
=
True
,
bootstrap_version
=
3
,
)
),
'representative'
:
forms
.
HiddenInput
}
representatives_positions/templates/representatives_positions/_form.haml
0 → 100644
View file @
a8eeff9f
-
load
bootstrap3
%form
{
:action
=>
'
{
% url
"representatives_positions:position-create"
%
}
',
:method => '
post
'
}
-
csrf_token
-
bootstrap_form
form
-
buttons
%button
{
'type'
:
'submit'
,
'class'
:
'btn btn-primary'
}
{% bootstrap_icon "star" %} Submit
-
endbuttons
representatives_positions/templates/representatives_positions/position_form.haml
0 → 100644
View file @
a8eeff9f
-
extends
'base.html'
-
block
head
{{ form.media }}
-
block
content
-
include
'representatives_positions/_form.html'
representatives_positions/views.py
View file @
a8eeff9f
...
...
@@ -10,7 +10,7 @@ from .forms import PositionForm
class
PositionCreate
(
generic
.
CreateView
):
model
=
Position
f
ield
s
=
PositionForm
.
Meta
.
fields
+
[
'representative'
]
f
orm_clas
s
=
PositionForm
def
get_success_url
(
self
):
return
self
.
object
.
representative
.
get_absolute_url
()
...
...
templates/representatives/representative_detail.haml
View file @
a8eeff9f
-# List representatives
-
extends
'base.html'
-
load
humanize
-
load
representatives_tags
-
load
representatives_votes_tags
-
load
representatives_recommendations_tags
-
load
bootstrap3
-
block
head
{{ position_form.media }}
...
...
@@ -15,6 +12,7 @@
.row
.col-md-6
-
include
'representatives/_representative_block.html'
with
representative
=
representative
.col-md-6
%h2
#votes
Votes
...
...
@@ -72,16 +70,4 @@
%a
{
:href
=>
'
{{
position
.
link
}}
'
}
=
position
.
link
%form
{
:action
=>
'
{
% url
"representatives_positions:position-create"
%
}
',
:method => '
post
'
}
-
csrf_token
%input
{
:type
=>
'hidden'
,
:name
=>
'representative'
,
:value
=>
'
{{
representative
.
pk
}}
'
}
-
bootstrap_form
position_form
-
buttons
%button
{
'type'
:
'submit'
,
'class'
:
'btn btn-primary'
}
{% bootstrap_icon "star" %} Submit
-
endbuttons
-
include
'representatives_positions/_form.html'
with
form
=
position_form
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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