Changeset 1150
- Timestamp:
- Nov 16, 2010, 6:48:08 PM (12 years ago)
- Location:
- trunk/grails-app
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/controllers/dbnp/studycapturing/WizardController.groovy
r1149 r1150 85 85 //[title: 'Templates'], // templates 86 86 [title: 'Start'], // load or create a study 87 [title: 'Study'], // study88 87 [title: 'Subjects'], // subjects 89 88 [title: 'Events'], // events and event grouping … … 121 120 handleJump { 122 121 action { 123 if (flow.jump && flow.jump.action == 'edit' && flow.jump.id) { 124 // load study 125 if (this.loadStudy(flow, flash, [studyid:flow.jump.id],authenticationService.getLoggedInUser())) { 126 toStudyPage() 122 if (flow.jump && flow.jump.action == 'edit') { 123 if (flow.jump.id) { 124 // load study 125 if (this.loadStudy(flow, flash, [studyid:flow.jump.id],authenticationService.getLoggedInUser())) { 126 toStudyPage() 127 } else { 128 toStartPage() 129 } 127 130 } else { 128 to StartPage()131 toModifyPage() 129 132 } 130 133 } else if (flow.jump && flow.jump.action == 'create') { … … 136 139 on("toStartPage").to "start" 137 140 on("toStudyPage").to "study" 141 on("toModifyPage").to "modify" 138 142 } 139 143 … … 192 196 render(view: "_study") 193 197 onRender { 194 flow.page = 2198 flow.page = 1 195 199 success() 196 200 } … … 236 240 render(view: "_subjects") 237 241 onRender { 238 flow.page = 3242 flow.page = 2 239 243 240 244 if (!flash.values || !flash.values.addNumber) flash.values = [addNumber:1] … … 294 298 render(view: "_events") 295 299 onRender { 296 flow.page = 4300 flow.page = 3 297 301 298 302 // add initial eventGroup to study … … 492 496 render(view: "_unassigned_samplingEvent_warning") 493 497 onRender { 494 flow.page = 4498 flow.page = 3 495 499 success() 496 500 } … … 503 507 render(view: "_groups") 504 508 onRender { 505 flow.page = 4509 flow.page = 3 506 510 success() 507 511 } … … 524 528 render(view: "_samples_previous_warning") 525 529 onRender { 526 flow.page = 5530 flow.page = 4 527 531 528 532 // TEMPORARY FIX TO REMOVE ALL SAMPLES AND REGENERATE THEM … … 547 551 render(view: "_samples") 548 552 onRender { 549 flow.page = 5553 flow.page = 4 550 554 success() 551 555 } … … 610 614 render(view: "_assays") 611 615 onRender { 612 flow.page = 6616 flow.page = 5 613 617 } 614 618 on("refresh") { … … 724 728 render(view: "_assay_groups") 725 729 onRender { 726 flow.page = 6730 flow.page = 5 727 731 } 728 732 on("previous") { … … 766 770 render(view: "_confirmation") 767 771 onRender { 768 flow.page = 7772 flow.page = 6 769 773 } 770 774 on("toStudy").to "study" … … 783 787 render(view: "_wait") 784 788 onRender { 785 flow.page = 8789 flow.page = 7 786 790 } 787 791 on("next").to "save" … … 828 832 render(view: "_error") 829 833 onRender { 830 flow.page = 7834 flow.page = 6 831 835 } 832 836 on("next").to "waitForSave" … … 838 842 render(view: "_done") 839 843 onRender { 840 flow.page = 8844 flow.page = 7 841 845 } 842 846 onEnd { -
trunk/grails-app/views/common/_topnav.gsp
r1119 r1150 5 5 <a href="#">Studies</a> 6 6 <ul class="subnav"> 7 <li><g:link controller="study" action="list">View studies</g:link></li> 8 <li><g:link controller="wizard" action="index">Create/edit study</g:link></li> 7 <sec:ifLoggedIn> 8 <li><g:link controller="study" action="myStudies">My studies</g:link></li> 9 <li><g:link controller="study" action="list">All studies</g:link></li> 10 </sec:ifLoggedIn> 11 <sec:ifNotLoggedIn> 12 <li><g:link controller="study" action="list">View studies</g:link></li> 13 </sec:ifNotLoggedIn> 14 <li><g:link controller="wizard" action="index" params="[jump:'create']">Create a new study</g:link></li> 15 <li><g:link controller="wizard" action="index" params="[jump:'edit']">Edit a study</g:link></li> 9 16 <li><g:link controller="importer" action="index">Import study data</g:link></li> 10 17 <li><g:link controller="simpleQuery" action="index">Search study data</g:link></li> 11 18 <li><g:link controller="exporter" action="index">Export as SimpleTox</g:link></li> 12 <sec:ifLoggedIn>13 <li><g:link controller="study" action="myStudies">My studies</g:link></li>14 </sec:ifLoggedIn>15 19 </ul> 16 20 </li>
Note: See TracChangeset
for help on using the changeset viewer.