Author: tchemit Date: 2012-10-21 20:36:58 +0200 (Sun, 21 Oct 2012) New Revision: 740 Url: http://forge.codelutin.com/repositories/revision/echobase/740 Log: fixes #1528: Am?\195?\169liorer la gestion des requ?\195?\170tes libre-office Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-10-21 18:16:19 UTC (rev 739) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-10-21 18:36:58 UTC (rev 740) @@ -19,10 +19,10 @@ echobase.action.exportTable=Export echobase.action.generateSqlQuery=Generate query echobase.action.import=Import +echobase.action.importLibreOfficeQuery=Import a Libre Office query echobase.action.importTable=Import echobase.action.login=Connect echobase.action.logout=Disconnect -echobase.action.newLibreOfficeQuery=New Libre Office query echobase.action.newQuery=New query echobase.action.newWorkingDbContiguration=New working database configuration echobase.action.reloadSqlQuery=Reload Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-10-21 18:16:19 UTC (rev 739) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-10-21 18:36:58 UTC (rev 740) @@ -19,10 +19,10 @@ echobase.action.exportTable=Exporter echobase.action.generateSqlQuery=Générer la requête echobase.action.import=Importer +echobase.action.importLibreOfficeQuery=Importer une requête Libre Office echobase.action.importTable=Importer echobase.action.login=Connexion echobase.action.logout=Déconnexion -echobase.action.newLibreOfficeQuery=Nouvelle requête Libre Office echobase.action.newQuery=Nouvelle requête echobase.action.newWorkingDbContiguration=Nouvelle configuration de base de travail echobase.action.reloadSqlQuery=Recharger Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp 2012-10-21 18:16:19 UTC (rev 739) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp 2012-10-21 18:36:58 UTC (rev 740) @@ -59,20 +59,9 @@ function openNewLibreOfficeDialog() { var dialog = $("#newLibreOfficeDialog"); var url = "<s:url action='newLibreOfficeQuery' namespace='/exportQuery' method="input"/>"; + dialog.html(""); dialog.load(url); dialog.dialog('open'); - } - - function newLibreOfficeQuery() { - if (<s:property value="%{queryExists or (!newQuery and !newLibreOfficeQuery)}"/>) { - reloadPage({'newLibreOfficeQuery':true}); - } else { - $('[name="query.topiaId"]').val(''); - $('[name="query.name"]').val(''); - $('[name="query.description"]').val(''); - $('[name="query.sqlQuery"]').val(''); - openNewLibreOfficeDialog(); - } return false; } @@ -95,10 +84,6 @@ <s:submit onclick="return newQuery('newQuery');" theme="simple" key="echobase.action.newQuery"/> </li> - <li> - <s:submit onclick="return newQuery('newLibreOfficeQuery');" theme="simple" - key="echobase.action.newLibreOfficeQuery"/> - </li> </ul> <fieldset> @@ -133,6 +118,10 @@ </s:if> <ul id="dbeditorToolbar" class="toolbar floatRight"> + <li> + <s:submit onclick="return openNewLibreOfficeDialog();" theme="simple" + key="echobase.action.importLibreOfficeQuery"/> + </li> <s:if test="queryExists"> <li> <s:submit onclick="return reloadQuery();" theme="simple"
participants (1)
-
tchemit＠users.forge.codelutin.com