Author: sletellier Date: 2011-11-15 10:27:59 +0100 (Tue, 15 Nov 2011) New Revision: 83 Url: http://forge.codelutin.com/repositories/revision/echobase/83 Log: - Retrieve import validation file Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/ImportAction-doImport-validation.xml Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/ImportAction-doImport-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/ImportAction-doImport-validation.xml 2011-11-15 08:40:07 UTC (rev 82) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/ImportAction-doImport-validation.xml 2011-11-15 09:27:59 UTC (rev 83) @@ -26,31 +26,11 @@ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> <validators> - <field name="query.name"> - - <field-validator type="requiredstring"> - <message key="echobase.validation.export.name.requiredstring"/> + <field name="importModel.accessImport"> + <field-validator type="expression"> + <param name="expression">(importModel.accessImport == null ^ importModel.selectedVoyage == null) == 1</param> + <message key="echobase.validation.import.selectedVoyageOrAccessImport.required"/> </field-validator> </field> - <field name="query.description"> - - <field-validator type="requiredstring"> - <message key="echobase.validation.export.description.requiredstring"/> - </field-validator> - </field> - - <field name="query.sqlQuery"> - - <field-validator type="requiredstring"> - <message key="echobase.validation.export.sqlQuery.requiredstring"/> - </field-validator> - <field-validator type="regex"> - <!-- TODO sletellier 2011/11/14 : Find a better regex exression to define sql query --> - <param name="expression">^\s*select\s+.+\s+from\s+.+$</param> - <param name="caseSensitive">false</param> - <message key="echobase.validation.export.sqlQuery.wrongformat"/> - </field-validator> - </field> - </validators> \ No newline at end of file