Changeset 1353

Timestamp:

Jan 7, 2011, 6:12:04 PM (12 years ago)

Author:

work@…

Message:

• fixed some issues with ajaxbuttons that were still left unworking after refactoring into ajaxflows (improvement #183)
• updated ajaxflow to 0.1.15

Location:

trunk

Files:

• application.properties (modified) (2 diffs)
• grails-app/controllers/dbnp/studycapturing/StudyWizardController.groovy (modified) (1 diff)
• grails-app/domain/dbnp/studycapturing/Study.groovy (modified) (1 diff)
• grails-app/views/studyWizard/pages/_assays.gsp (modified) (1 diff)
• grails-app/views/studyWizard/pages/_events.gsp (modified) (3 diffs)
• grails-app/views/studyWizard/pages/_subjects.gsp (modified) (1 diff)

trunk/application.properties

@@ -1 +1 @@
 #Grails Metadata file
-#Wed Jan 05 16:37:39 CET 2011
+#Fri Jan 07 17:58:28 CET 2011
 app.build.display.info=0
 app.build.svn.revision=1079
@@ -9 +9 @@
 app.servlet.version=2.4
 app.version=0.6.1
-plugins.ajaxflow=0.1.14
+plugins.ajaxflow=0.1.15
 plugins.crypto=2.0
 plugins.db-util=0.4

trunk/grails-app/controllers/dbnp/studycapturing/StudyWizardController.groovy

@@ -524 +524 @@
                                 // remove eventGroup
                                 def eventGroupToRemove = flow.study.eventGroups.find { it.getIdentifier() == (params.get('do') as int) }
+                                if (eventGroupToRemove) {
+                                        flow.study.deleteEventGroup( eventGroupToRemove )
+                                }
                         }.to "events"
                         on("duplicate") {

trunk/grails-app/domain/dbnp/studycapturing/Study.groovy

@@ -217 +217 @@
                 // Delete the subject from the event groups it was referenced in
                 this.eventGroups.each {
-                        if (it.subjects.contains(subject)) {
+                        if (it.subjects?.contains(subject)) {
                                 it.removeFromSubjects(subject)
                         }

trunk/grails-app/views/studyWizard/pages/_assays.gsp

@@ -50 +50 @@
                                 <div class="row">
                                         <div class="firstColumn">
-                                                <wizard:ajaxButton name="deleteAssay" src="${resource(dir: 'images/icons', file: 'delete.png', plugin: 'famfamfam')}" alt="delete this assay" class="famfamfam" value="-" before="\$(\'input[name=do]\').val(${assay.getIdentifier()});" afterSuccess="onPage()"/>
+                                                <af:ajaxButton name="deleteAssay" src="${resource(dir: 'images/icons', file: 'delete.png', plugin: 'famfamfam')}" alt="delete this assay" class="famfamfam" value="-" before="\$(\'input[name=do]\').val(${assay.getIdentifier()});" afterSuccess="onPage()"/>
                                         </div>
                                         <wizard:templateColumns class="column" entity="${assay}" name="assay_${assay.getIdentifier()}" />

trunk/grails-app/views/studyWizard/pages/_events.gsp

@@ -83 +83 @@
                                         <div class="column">
                                                 <g:textField name="eventGroup_${eventGroup.getIdentifier()}_${template.getIdentifier()}" value="${eventGroup.name}" />
-                                                <wizard:ajaxButton name="deleteEventGroup" src="${resource(dir: 'images/icons', file: 'delete.png', plugin: 'famfamfam')}" alt="delete this eventgroup" class="famfamfam" value="-" before="\$(\'input[name=do]\').val(${eventGroup.getIdentifier()});" afterSuccess="onPage()" />
+                                                <af:ajaxButton name="deleteEventGroup" src="${resource(dir: 'images/icons', file: 'delete.png', plugin: 'famfamfam')}" alt="delete this eventgroup" class="famfamfam" value="-" before="\$(\'input[name=do]\').val(${eventGroup.getIdentifier()});" afterSuccess="onPage()" />
                                         </div>
                                         </g:each></g:if>
                                         <div class="firstColumn">
-                                                <wizard:ajaxButton name="addEventGroup" src="${resource(dir: 'images/icons', file: 'add.png', plugin: 'famfamfam')}" alt="add a new eventgroup" class="famfamfam" value="+" afterSuccess="onPage()" />
+                                                <af:ajaxButton name="addEventGroup" src="${resource(dir: 'images/icons', file: 'add.png', plugin: 'famfamfam')}" alt="add a new eventgroup" class="famfamfam" value="+" afterSuccess="onPage()" />
                                         </div>
                                   <wizard:templateColumnHeaders class="column" entity="${event}" />
@@ -95 +95 @@
                                 <div class="row">
                                         <div class="firstColumn">
-                                                <wizard:ajaxButton name="deleteEvent" src="${resource(dir: 'images/icons', file: 'delete.png', plugin: 'famfamfam')}" alt="delete this event" class="famfamfam" value="-" before="\$(\'input[name=do]\').val(${event.getIdentifier()});" afterSuccess="onPage()"/>
+                                                <af:ajaxButton name="deleteEvent" src="${resource(dir: 'images/icons', file: 'delete.png', plugin: 'famfamfam')}" alt="delete this event" class="famfamfam" value="-" before="\$(\'input[name=do]\').val(${event.getIdentifier()});" afterSuccess="onPage()"/>
                                         </div>
                                         <g:if test="${study.eventGroups}"><g:each var="eventGroup" in="${study.eventGroups}">
@@ -107 +107 @@
                                         </g:each></g:if>
                                         <div class="firstColumn">
-                                                <wizard:ajaxButton name="duplicate" src="${resource(dir: 'images/icons', file: 'application_put.png', plugin: 'famfamfam')}" alt="duplicate this event" class="famfamfam" value="-" before="\$(\'input[name=do]\').val(${event.getIdentifier()});" afterSuccess="onPage()" />
+                                                <af:ajaxButton name="duplicate" src="${resource(dir: 'images/icons', file: 'application_put.png', plugin: 'famfamfam')}" alt="duplicate this event" class="famfamfam" value="-" before="\$(\'input[name=do]\').val(${event.getIdentifier()});" afterSuccess="onPage()" />
                                         </div>
                                         <wizard:templateColumns class="column" entity="${event}" name="event_${event.getIdentifier()}" />

trunk/grails-app/views/studyWizard/pages/_subjects.gsp

@@ -52 +52 @@
                                 <div class="row">
                                         <div class="firstColumn">
-                                                <wizard:ajaxButton name="delete" src="${resource(dir: 'images/icons', file: 'delete.png', plugin: 'famfamfam')}" alt="delete this subject" class="famfamfam" value="-" before="\$(\'input[name=do]\').val(${subject.getIdentifier()});" afterSuccess="onPage()" />
+                                                <af:ajaxButton name="delete" src="${resource(dir: 'images/icons', file: 'delete.png', plugin: 'famfamfam')}" alt="delete this subject" class="famfamfam" value="-" before="\$(\'input[name=do]\').val(${subject.getIdentifier()});" afterSuccess="onPage()" />
                                         </div>
                                         <wizard:templateColumns class="column" entity="${subject}" name="subject_${subject.getIdentifier()}" />