not require strain when updating bioSample

- not require strain when updating bioSample
- fix the bug that species is not updated when updating bioSamples with no strain
- update liquibase

Author: dshao

pegr/build.gradle

@@ -86,7 +86,7 @@ dependencies {
     compile 'org.grails.plugins:external-config:2.0.0'
     compile 'org.grails.plugins:excel-export:2.1'
     compile fileTree(dir: 'libs', include: '*.jar')
-    compile 'org.liquibase:liquibase-core:3.6.1'
+    compile 'org.liquibase:liquibase-core:3.6.3'
     testRuntime "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"  
     testRuntime "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion" 
     testRuntime "org.seleniumhq.selenium:selenium-safari-driver:$seleniumSafariDriverVersion" 

pegr/grails-app/services/pegr/CellSourceService.groovy

@@ -129,19 +129,21 @@ class CellSourceService {
         def mutationStr = utilityService.cleanString(_mutationStr)
 
         // get the parent strain        
-        def parentStrain = Strain.findByName(parentStrainStr)
+        def parentStrain = Strain.findBySpeciesAndName(species, parentStrainStr)
         if (!parentStrain) {
                 parentStrain = new Strain(name: parentStrainStr, species: species).save(failOnError: true) 
         }
+        
         // get strain    
-        def strain = Strain.findByNameAndParentAndGenotypeAndGeneticModification(strainStr, parentStrain, genotypeStr, mutationStr)
+        def strain = Strain.findBySpeciesAndNameAndParentAndGenotypeAndGeneticModification(species, strainStr, parentStrain, genotypeStr, mutationStr)
         if (!strain) {
             strain = new Strain(name: strainStr, 
                                 species: species, 
                                 genotype: genotypeStr, 
                                 parent: parentStrain, 
                                 geneticModification: mutationStr).save( failOnError: true)
         }
+
         return strain
 	}
 

pegr/grails-app/views/cellSource/_form.gsp

@@ -21,7 +21,7 @@
 
 <div>
 	<label>Strain</label>
-    <select name="strain" class="strain tag-select2 textcontrol" style="width: 150px" required>
+    <select name="strain" class="strain tag-select2 textcontrol" style="width: 150px">
         <option value="${cellSource?.strain}" selected>${cellSource?.strain}</option>
     </select>
 </div>