Changeset 418


Ignore:
Timestamp:
May 17, 2010, 11:56:00 AM (7 years ago)
Author:
duh
Message:
  • subjects can now be deleted properly
  • event grouping works
  • working on upgrading to grails 1.3 (added grails default stuff to ignore list)
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/controllers/dbnp/studycapturing/WizardController.groovy

    r416 r418  
    157157
    158158                                if (!flow.subjects) {
    159                                         flow.subjects = []
     159                                        flow.subjects = [:]
    160160                                        flow.subjectTemplates = [:]
    161161                                }
     
    341341                                }
    342342
    343                                 flow.eventGroups[increment] = new EventGroup(name: groupName)
     343                                flow.eventGroups[increment] = new EventGroup( name: groupName )
    344344                        }.to "events"
    345345                        on("deleteEventGroup") {
     
    651651                // walk through eventGroups
    652652                def g = 0
    653                 flow.eventGroups.each() {
     653
     654                flow.eventGroups.each() { eventGroup ->
    654655                        def e = 0
    655                         def eventGroup = it
    656656
    657657                        // reset events
    658658                        eventGroup.events = new HashSet()
    659659
    660                         // walk through events
     660                        // iterate through events
    661661                        flow.events.each() {
    662662                                if (params.get('event_' + e + '_group_' + g) == 'on') {
  • trunk/grails-app/views/wizard/pages/_events.gsp

    r416 r418  
    5353                                <div class="firstColumn">${eventId + 1}</div>
    5454                                <div class="firstColumn">
    55                                         <wizard:ajaxButton name="delete" src="../images/icons/famfamfam/delete.png" alt="delete this subject" class="famfamfam" value="-" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" before="\$(\'input[name=do]\').val(${eventId});" afterSuccess="onWizardPage()"/>
     55                                        <wizard:ajaxButton name="deleteEvent" src="../images/icons/famfamfam/delete.png" alt="delete this subject" class="famfamfam" value="-" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" before="\$(\'input[name=do]\').val(${eventId});" afterSuccess="onWizardPage()"/>
    5656                                </div>
    5757                                <wizard:templateColumns id="${eventId}" entity="${events[ eventId ]}" template="${events[ eventId ].template}" name="event_${eventId}" class="column" />
    5858                                <g:if test="${eventGroups}"><g:each var="eventGroup" status="j" in="${eventGroups}">
    5959                                <div class="column">
    60                                         <g:if test="${eventGroup.events.find{ it == event} }">
     60                                        <g:if test="${eventGroup.events.find{ it == events[ eventId ] } }">
    6161                                                <input type="checkbox" name="event_${eventId}_group_${j}" checked="checked" />
    6262                                        </g:if><g:else>
  • trunk/web-app/WEB-INF/tld/grails.tld

    r70 r418  
    55            http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
    66        version="2.0">
    7     <description>The Grails (Groovy on Rails) custom tag library</description>
     7    <description>The Grails custom tag library</description>
    88    <tlib-version>0.2</tlib-version>
    99    <short-name>grails</short-name>
    1010    <uri>http://grails.codehaus.org/tags</uri>
    11 
    1211
    1312    <tag>
  • trunk/web-app/css

    • Property svn:ignore set to
      main.css
  • trunk/web-app/images

    • Property svn:ignore set to
      skin
      grails_logo.jpg
      leftnav_btm.png
      leftnav_midstretch.png
      leftnav_top.png
      springsource.png
  • trunk/web-app/js

    • Property svn:ignore
      •  

        old new  
        11jquery
        22prototype
         3application.js
Note: See TracChangeset for help on using the changeset viewer.