Vauxoo Addons

Merge lp:~vauxoo/addons-vauxoo/7.0-user_story-rev4-kty into lp:addons-vauxoo/7.0

  1. 7.0-user_story-rev4-kty
  2. Merge into 7.0
Proposed by Katherine Zaoral (Vauxoo)
Status: Merged
Merged at revision: 984
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0-user_story-rev4-kty
Merge into: lp:addons-vauxoo/7.0
Diff against target: 44 lines (+18/-3)
2 files modified
user_story/security/ir.model.access.csv (+2/-1)
user_story/view/userstory_view.xml (+16/-2)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0-user_story-rev4-kty
Reviewer Review Type Date Requested Status
Gabriela Quilarque Approve
Review via email: mp+211138@code.launchpad.net

Commit message

[MERGE] Minor changes in the views of user story module and some fixes.

Description of the change

[MERGE] Minor changes in the views of user story module and some fixes.

To post a comment you must log in.
Revision history for this message
Gabriela Quilarque (gabrielaquilarque97) wrote :

Kathy gracias por los screen shot. Por favor podrias intentar que los campos development y difficulty en la vista en form esten uno al lado del otro, de forma que queden en la misma linea.

lp:~vauxoo/addons-vauxoo/7.0-user_story-rev4-kty updated
985. By Katherine Zaoral (Vauxoo)

[IMP] modificating the user.story.form.acpt_ids[form] to show the boolean
fields aling inline.

Revision history for this message
Katherine Zaoral (Vauxoo) (kathy-zaoral) wrote :

listo el ultimo requerimiento. rev 985.
También el runbot corrió y no arrojo errores.

Revision history for this message
Gabriela Quilarque (gabrielaquilarque97) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'user_story/security/ir.model.access.csv'
2--- user_story/security/ir.model.access.csv 2012-08-27 15:13:45 +0000
3+++ user_story/security/ir.model.access.csv 2014-03-14 21:56:46 +0000
4@@ -3,4 +3,5 @@
5 "access_user_story_manager","user.story.manager","model_user_story","user_story.group_user_story_manager",1,1,1,1
6 "access_acceptability_criteria_user","acceptability.criteria.user","model_acceptability_criteria","user_story.group_user_story_user",1,0,0,0
7 "access_acceptability_criteria_manager","acceptability.criteria.manager","model_acceptability_criteria","user_story.group_user_story_manager",1,1,1,1
8-
9+"access_user_story_priority_manager","user.story.priority.manager","model_user_story_priority","user_story.group_user_story_manager",1,1,1,1
10+"access_user_story_priority_user","user.story.priority.user","model_user_story_priority","user_story.group_user_story_user",1,0,0,0
11
12=== modified file 'user_story/view/userstory_view.xml'
13--- user_story/view/userstory_view.xml 2014-03-06 01:32:19 +0000
14+++ user_story/view/userstory_view.xml 2014-03-14 21:56:46 +0000
15@@ -82,13 +82,27 @@
16 <field name="name" colspan="4" nolabel="1"/>
17 <separator string="Scenario" colspan="4"/>
18 <field name="scenario" colspan="4" nolabel="1"/>
19- <separator string="Accepted" colspan="4"/>
20- <field name="accepted" colspan="4" nolabel="1"/>
21+ <group colspan="4" col="3">
22+ <group colspan="1" col="1">
23+ <separator string="Accepted"/>
24+ <field name="accepted" nolabel="1"/>
25+ </group>
26+ <group colspan="1" col="1">
27+ <separator string="Development"/>
28+ <field name="development" nolabel="1"/>
29+ </group>
30+ <group colspan="1" col="1">
31+ <separator string="Difficulty"/>
32+ <field name="difficulty" nolabel="1"/>
33+ </group>
34+ </group>
35 </form>
36 <tree string="Acceptability Criteria">
37 <field name="name"/>
38 <field name="scenario"/>
39 <field name="accepted"/>
40+ <field name="development"/>
41+ <field name="difficulty"/>
42 </tree>
43 </field>
44 </page>