Changeset 1565 for trunk/grails-app

Timestamp:

Feb 25, 2011, 2:27:48 PM (10 years ago)

Author:

robert@…

Message:

Fixed #260 (study wizard in safari) and fixed a bug when adding a publication with a lot of authors (>255 characters)

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/PublicationController.groovy (modified) (2 diffs)
• taglib/dbnp/studycapturing/WizardTagLib.groovy (modified) (6 diffs)
• views/simpleWizard/study.gsp (modified) (1 diff)

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

@@ -31 +31 @@
             pubMedID: params.get( 'publication-pubMedID' ),
             DOI: params.get( 'publication-doi' )
-        )
+        );
+        
+                // Check whether the autorsList is not too long. If it is, split it
+                println "authors length: " + publication.authorsList.size()
+                if( publication.authorsList.size() > 255 ) {
+                        def postfix = " et al.";
+                        def split = publication.authorsList[ 0..255 - postfix.size()].lastIndexOf( ", " );
+                        publication.authorsList = publication.authorsList[ 0..split-1] + postfix;
+                        
+                        println "new authors list: " + publication.authorsList.size() + " - " + publication.authorsList
+                }
 
         def message;
@@ -160 +170 @@
                     pubMedID: params.get( 'publication-pubMedID' ),
                     DOI: params.get( 'publication-doi' )
-                ).save(flush:true);
+                );
+                        
+                                // Check whether the autorsList is not too long. If it is, split it
+                                println "authors length: " + publication.authorsList.size()
+                                if( publication.authorsList.size() > 255 ) {
+                                        def postfix = " et al.";
+                                        def split = publication.authorsList[ 0..255 - postfix.size()].lastIndexOf( ", " );
+                                        publication.authorsList = publication.authorsList[ 0..split-1] + postfix;
+                                        
+                                        println "new authors list: " + publication.authorsList.size() + " - " + publication.authorsList
+                                }
+                        
+                                publication.save(flush:true);
             }
 

trunk/grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy

@@ -107 +107 @@
                         body
                 )
-
-                attrs.description = '';
-
-                // render 'Add publication button'
-                baseElement.call(
-                        '_publicationAddButton',
-                        attrs,
-                        body
-                )
         }
 
@@ -183 +174 @@
                 }
                 out << '<input type="hidden" name="' + attrs.name + '_ids" value="' + ids + '" id="' + attrs.name + '_ids">';
+                
+                out << _publicationAddButton( attrs, body );
         }
 
@@ -194 +187 @@
                 }
         
-                out << '<input type="button" onClick="openPublicationDialog(\'' + attrs.name + '\' );" value="Add Publication">';
+                out << '<input class="addButton" type="button" onClick="openPublicationDialog(\'' + attrs.name + '\' );" value="Add Publication">';
         }
         
@@ -353 +346 @@
                 baseElement.call(
                         '_userList',
-                        attrs,
-                        body
-                )
-
-                attrs.description = '';
-
-                // render 'Add user button'
-                baseElement.call(
-                        '_userAddButton',
                         attrs,
                         body
@@ -429 +413 @@
                 }
                 out << '<input type="hidden" name="' + attrs.name + '_ids" value="' + ids + '" id="' + attrs.name + '_ids">';
+                
+                out << _userAddButton( attrs, body );
         }
 
@@ -439 +425 @@
                 }
 
-                out << '<input type="button" onClick="openUserDialog(\'' + attrs.name + '\' );" value="Add User">';
+                out << '<input class="addButton" type="button" onClick="openUserDialog(\'' + attrs.name + '\' );" value="Add User">';
         }
         

trunk/grails-app/views/simpleWizard/study.gsp

@@ -44 +44 @@
                                         <h2>Publications</h2>
                                         <div class="content">
-                                                <af:publicationSelectElement noForm=true name="publication" value="${study?.publications}"/>
+                                                <af:publicationSelectElement noForm="true" name="publication" value="${study?.publications}"/>
                                         </div>
                                 </div>