lp:~aelkner/schooltool/term_linkage

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:schooltool/1.7 at revision 2800

Gediminas Paulauskas (community): Approve on 2011-05-26

Justas Sadzevičius (community): Disapprove on 2011-05-20

Diff: 2105 lines (+1778/-123) (has conflicts)

18 files modified

CHANGES.txt (+4/-0)
src/schooltool/app/browser/ftests/app.txt (+20/-42)
src/schooltool/course/browser/configure.zcml (+33/-0)
src/schooltool/course/browser/ftests/propagate_roster_changes.txt (+210/-0)
src/schooltool/course/browser/ftests/section_linkage.txt (+655/-0)
src/schooltool/course/browser/ftests/sections_and_courses.txt (+17/-39)
src/schooltool/course/browser/section.py (+235/-1)
src/schooltool/course/browser/templates/extend_term.pt (+37/-0)
src/schooltool/course/browser/templates/link_existing.pt (+81/-0)
src/schooltool/course/browser/templates/section.pt (+36/-40)
src/schooltool/course/browser/templates/section_linkage.pt (+79/-0)
src/schooltool/course/browser/templates/unlink_section.pt (+47/-0)
src/schooltool/course/course.zcml (+19/-0)
src/schooltool/course/section.py (+47/-0)
src/schooltool/export/ftests/linked_sections.txt (+197/-0)
src/schooltool/export/ftests/test_all.py (+4/-0)
src/schooltool/export/importer.py (+15/-1)
src/schooltool/skin/resources/schooltool.css (+42/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #424498: Import section members from linked term	High	Fix Released
Bug #485639: Terms cannot be titled "First" or "Last"	Low	Fix Released

Link a bug report

Related blueprints

2784. By Alan Elkner on 2011-05-24

put back level=2 for export functional tests, adding comment to help developers

2783. By Alan Elkner on 2011-05-20

changed automatic section linkage to be dependent on user saying yes after 'Link?'

2782. By Alan Elkner on 2011-05-19

importing sections now automatically links sections in other terms whose ids match

2781. By Alan Elkner on 2011-04-20

moved extend_term message logic to the template

2780. By Alan Elkner on 2011-04-18

changed message in extend_term view to be a sentence
added use of h2 in headers of other templates

2779. By Alan Elkner on 2011-04-17

created subscribers for propagating roster changes to linked sections

2778. By Alan Elkner on 2011-04-15

small spacer for appearance

2777. By Alan Elkner on 2011-04-15

created unlink_section.html view

2776. By Alan Elkner on 2011-04-14

added unlink section links to roster columns in section_linkage view

2775. By Alan Elkner on 2011-04-14

created link_existing.html view