Merge in Rami's changes from last friday.
authorDiane Trout <diane@caltech.edu>
Wed, 21 Jan 2009 02:50:22 +0000 (02:50 +0000)
committerDiane Trout <diane@caltech.edu>
Wed, 21 Jan 2009 02:50:22 +0000 (02:50 +0000)
commite07f9c1a2346fdda876a639f1a2f196c6577190c
treef672c48d7eef5bb1923c417dc5dd2532ffae7ae2
parentf655b1195d2b2904b8d69dbd963970b4a72783d5
Merge in Rami's changes from last friday.

Most of the admin pages work. Though there's a wsgi error with the reports.
I'll try to figure out tomorrow.

the biggest difference between caltech trunk and stanford schemas right now
is caltech is using made_for as a foreign key, and stanford is using it
as a text field.
15 files changed:
docs/Conv_StanfordDB_2009Jan20.txt [new file with mode: 0644]
htsworkflow/frontend/analysis/main.py
htsworkflow/frontend/analysis/models.py
htsworkflow/frontend/experiments/admin.py
htsworkflow/frontend/experiments/models.py
htsworkflow/frontend/experiments/urls.py
htsworkflow/frontend/experiments/views.py
htsworkflow/frontend/reports/LibraryInfo.xml
htsworkflow/frontend/reports/models.py
htsworkflow/frontend/reports/urls.py
htsworkflow/frontend/samples/admin.py
htsworkflow/frontend/samples/models.py
htsworkflow/frontend/templates/admin/index.html [new file with mode: 0644]
htsworkflow/frontend/templates/experiments/flowcellSheet.html
htsworkflow/frontend/urls.py