July 2013 - Franciaflex-magalie-commits - mailman.cloud.codelutin.com

r323 - trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action
by bleny＠users.forge.codelutin.com July 23, 2013

July 23, 2013

Author: bleny Date: 2013-07-23 16:55:08 +0200 (Tue, 23 Jul 2013) New Revision: 323 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fix ui give always the same requestedArticle to withdraw Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-07-23 11:51:55 UTC (rev 322) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-07-23 14:55:08 UTC (rev 323) @@ -154,6 +154,7 @@ model.put("articleId", articleId); model.put("destinationLocationId", destinationLocationId); model.put("expectedQuantity", expectedQuantity); + model.put("requestedArticleId", requestedArticleId); String json = JSONUtil.serialize(model);

1 0

r322 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie magalie-web/src/main/java/com/franciaflex/magalie/web
by bleny＠users.forge.codelutin.com July 23, 2013

July 23, 2013

Author: bleny Date: 2013-07-23 13:51:55 +0200 (Tue, 23 Jul 2013) New Revision: 322 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: enable reading another property file for configuration Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationContext.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationListener.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-07-23 11:50:57 UTC (rev 321) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-07-23 11:51:55 UTC (rev 322) @@ -44,12 +44,20 @@ protected ApplicationConfig applicationConfig; - protected ImmutableMap<String,String> oracleCompatibilityModeJpaParameters; + protected ImmutableMap<String, String> oracleCompatibilityModeJpaParameters; public MagalieApplicationConfig() { + this("magalie"); + } + + public MagalieApplicationConfig(String contextPath) { applicationConfig = new ApplicationConfig(); applicationConfig.loadDefaultOptions(MagalieConfigOption.values()); - applicationConfig.setConfigFileName("magalie.properties"); + String configFileName = contextPath + ".properties"; + if (log.isDebugEnabled()) { + log.debug("will read file config file name " + configFileName); + } + applicationConfig.setConfigFileName(configFileName); try { applicationConfig.parse(); } catch (ArgumentsParserException e) { Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationContext.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationContext.java 2013-07-23 11:50:57 UTC (rev 321) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationContext.java 2013-07-23 11:51:55 UTC (rev 322) @@ -47,9 +47,15 @@ protected EntityManagerFactory entityManagerFactory; + protected String contextPath; + + public MagalieApplicationContext(String contextPath) { + this.contextPath = contextPath; + } + public MagalieApplicationConfig getMagalieApplicationConfig() { if (applicationConfig == null) { - applicationConfig = new MagalieApplicationConfig(); + applicationConfig = new MagalieApplicationConfig(contextPath); } return applicationConfig; } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationListener.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationListener.java 2013-07-23 11:50:57 UTC (rev 321) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationListener.java 2013-07-23 11:51:55 UTC (rev 322) @@ -38,11 +38,13 @@ @Override public void contextInitialized(ServletContextEvent sce) { + String contextPath = sce.getServletContext().getContextPath().replace("/", ""); + if (log.isInfoEnabled()) { - log.info("init MagaLiE"); + log.info("init MagaLiE for context path '" + contextPath + "'"); } - applicationContext = new MagalieApplicationContext(); + applicationContext = new MagalieApplicationContext(contextPath); sce.getServletContext().setAttribute( MagalieApplicationContext.APPLICATION_CONTEXT_PARAMETER,

1 0

r321 - in trunk/magalie-web/src/main/java/com/franciaflex/magalie/web: . action
by bleny＠users.forge.codelutin.com July 23, 2013

July 23, 2013

Author: bleny Date: 2013-07-23 13:50:57 +0200 (Tue, 23 Jul 2013) New Revision: 321 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fix unable to restore fixtures from report Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-07-22 15:06:42 UTC (rev 320) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-07-23 11:50:57 UTC (rev 321) @@ -30,6 +30,7 @@ import com.franciaflex.magalie.web.action.IndexAction; import com.franciaflex.magalie.web.action.LoginAction; import com.franciaflex.magalie.web.action.ReportAction; +import com.franciaflex.magalie.web.action.RestoreFixturesAction; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.opensymphony.xwork2.ActionInvocation; @@ -52,7 +53,12 @@ public class MagalieInterceptor implements Interceptor { public static final ImmutableSet<Class<? extends MagalieActionSupport>> ACCESSIBLE_ACTIONS_FOR_NOT_LOGGED_USER = - ImmutableSet.of(LoginAction.class, IndexAction.class, ChooseCompanyAction.class, ReportAction.class); + ImmutableSet.of( + LoginAction.class, + IndexAction.class, + ChooseCompanyAction.class, + ReportAction.class, + RestoreFixturesAction.class); private static final Log log = LogFactory.getLog(MagalieInterceptor.class); Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java 2013-07-22 15:06:42 UTC (rev 320) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java 2013-07-23 11:50:57 UTC (rev 321) @@ -25,6 +25,7 @@ import com.franciaflex.magalie.services.service.FixturesService; import com.franciaflex.magalie.web.MagalieActionSupport; +import com.franciaflex.magalie.web.MagalieSession; import org.apache.struts2.convention.annotation.Result; import org.apache.struts2.convention.annotation.Results; @@ -35,16 +36,22 @@ protected FixturesService service; + protected MagalieSession session; + public void setService(FixturesService service) { this.service = service; } + public void setSession(MagalieSession session) { + this.session = session; + } + @Override public String execute() { service.cleanDatabaseAndLoadFixtures("fixtures"); - addActionMessage("Jeu de données initial restauré"); + session.addMessage("Jeu de données initial restauré"); return SUCCESS;

1 0

r320 - trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com July 22, 2013

July 22, 2013

Author: bleny Date: 2013-07-22 17:06:42 +0200 (Mon, 22 Jul 2013) New Revision: 320 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fix tests Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/FulfilKanbanServiceTest.java Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/FulfilKanbanServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/FulfilKanbanServiceTest.java 2013-07-22 15:02:25 UTC (rev 319) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/FulfilKanbanServiceTest.java 2013-07-22 15:06:42 UTC (rev 320) @@ -97,9 +97,10 @@ Article articleWithNoStock = fixture("article4"); - boolean articleUnavailable = - service.getRealTimeStorageMovementTask(building, magalieUser, articleWithNoStock.getId()); + RealTimeStorageMovementTask realTimeStorageMovementTask = service.getRealTimeStorageMovementTask(building, magalieUser, articleWithNoStock.getId()); + boolean articleUnavailable = realTimeStorageMovementTask.isArticleUnavailable(); + Assert.assertTrue(articleUnavailable); EntityManager entityManager = getJpaEntityManagerRule().newEntityManager();

1 0

r319 - trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com July 22, 2013

July 22, 2013

Author: bleny Date: 2013-07-22 17:02:25 +0200 (Mon, 22 Jul 2013) New Revision: 319 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: in storage transfer service, prevent movementDate = null Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java 2013-07-22 14:45:04 UTC (rev 318) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java 2013-07-22 15:02:25 UTC (rev 319) @@ -143,6 +143,8 @@ storageMovement.setActualQuantity(quantity); + storageMovement.setMovementDate(now); + storageMovement.setConfirmDate(now); storageMovementDao.persist(storageMovement);

1 0

r318 - in trunk/magalie-web/src/main: java/com/franciaflex/magalie/web/action webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com July 22, 2013

July 22, 2013

Author: bleny Date: 2013-07-22 16:45:04 +0200 (Mon, 22 Jul 2013) New Revision: 318 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: in storage transfer, fix bug 'quantity' value was erased Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java 2013-07-22 14:34:23 UTC (rev 317) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java 2013-07-22 14:45:04 UTC (rev 318) @@ -110,8 +110,6 @@ storedArticle = Iterables.find(storedArticles, JpaEntities.entityHasId(storedArticleId)); - quantity = storedArticle.getQuantity(); - } Company company = session.getBuilding().getCompany(); @@ -125,6 +123,11 @@ prepare(); + // default value + if (storedArticle != null) { + quantity = storedArticle.getQuantity(); + } + return INPUT; } Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-07-22 14:34:23 UTC (rev 317) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-07-22 14:45:04 UTC (rev 318) @@ -99,7 +99,7 @@ <s:hidden name="originId" value="%{origin.id}" /> <s:hidden name="storedArticleId" value="%{storedArticle.id}" /> - <s:textfield name="quantity" label="Qté" inputAppend="%{storedArticle.article.unit}" type="number" step="any" min="0" cssClass="input-mini" /> + <s:textfield name="quantity" value="%{quantity}" label="Qté" inputAppend="%{storedArticle.article.unit}" type="number" step="any" min="0" cssClass="input-mini" /> <s:select label="Bât. dest." key="destinationBuildingId"

1 0

r317 - trunk/magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com July 22, 2013

July 22, 2013

Author: bleny Date: 2013-07-22 16:34:23 +0200 (Mon, 22 Jul 2013) New Revision: 317 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: now Esc in storage-transfer-input returns user to scan location code, not choose activity Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-07-22 14:30:01 UTC (rev 316) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-07-22 14:34:23 UTC (rev 317) @@ -40,7 +40,7 @@ <link rel="stylesheet" href="<s:url value='/css/magalie-ck3x-reduced.css' />"/> </head> -<s:url action="choose-activity" id="cancelUrl" /> +<s:url action="storage-transfer-location!input" id="cancelUrl" /> <header> <dl class="dl-horizontal">

1 0

r316 - in trunk: magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-services/src/test/java/com/franciaflex/magalie/services/service magalie-web/src/main/java/com/franciaflex/magalie/web/action magalie-web/src/main/webapp/WEB-INF/content magalie-web/src/main/webapp/js
by bleny＠users.forge.codelutin.com July 22, 2013

July 22, 2013

Author: bleny Date: 2013-07-22 16:30:01 +0200 (Mon, 22 Jul 2013) New Revision: 316 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes the use of F4 and F5 in withdraw-item-input Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/FulfilKanbanServiceTest.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-07-13 15:17:38 UTC (rev 315) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-07-22 14:30:01 UTC (rev 316) @@ -114,6 +114,8 @@ } + persistenceContext.commit(); + } protected Set<StoredArticle> sortStoredArticlesByPriority(Iterable<StoredArticle> storedArticles) { Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java 2013-07-13 15:17:38 UTC (rev 315) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java 2013-07-22 14:30:01 UTC (rev 316) @@ -120,7 +120,7 @@ } - public boolean isArticleUnavailable(Building building, MagalieUser magalieUser, String articleId) { + public RealTimeStorageMovementTask getRealTimeStorageMovementTask(Building building, MagalieUser magalieUser, String articleId) { ArticleStorageService articleStorageService = serviceContext.newService(ArticleStorageService.class); @@ -128,7 +128,7 @@ RealTimeStorageMovementTask realTimeStorageMovementTask = articleStorageService.getRealTimeStorageMovementTask(building, magalieUser, articleId); - return realTimeStorageMovementTask.isArticleUnavailable(); + return realTimeStorageMovementTask; } Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/FulfilKanbanServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/FulfilKanbanServiceTest.java 2013-07-13 15:17:38 UTC (rev 315) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/FulfilKanbanServiceTest.java 2013-07-22 14:30:01 UTC (rev 316) @@ -1,6 +1,10 @@ package com.franciaflex.magalie.services.service; +import com.franciaflex.magalie.persistence.dao.UnavailableArticleJpaDao; import com.franciaflex.magalie.persistence.entity.Article; +import com.franciaflex.magalie.persistence.entity.Building; +import com.franciaflex.magalie.persistence.entity.MagalieUser; +import com.franciaflex.magalie.persistence.entity.UnavailableArticle; import com.franciaflex.magalie.persistence.entity.Warehouse; import com.franciaflex.magalie.services.AbstractMagalieServiceTest; import com.franciaflex.magalie.services.exception.ArticleNotAvailableForKanbanException; @@ -10,12 +14,20 @@ import org.junit.Before; import org.junit.Test; +import javax.persistence.EntityManager; +import java.util.Date; +import java.util.List; + public class FulfilKanbanServiceTest extends AbstractMagalieServiceTest { private static final Log log = LogFactory.getLog(FulfilKanbanServiceTest.class); protected FulfilKanbanService service; + protected Building building; + + protected MagalieUser magalieUser; + protected Warehouse warehouse; @Before @@ -25,6 +37,12 @@ warehouse = fixture("B01"); + building = fixture("B1"); + + magalieUser = fixture("bruno"); + + serviceContext.setDate(new Date(1374496598822l)); + service = newService(FulfilKanbanService.class); } @@ -74,4 +92,27 @@ } + @Test + public void testIsArticleUnavailable() { + + Article articleWithNoStock = fixture("article4"); + + boolean articleUnavailable = + service.getRealTimeStorageMovementTask(building, magalieUser, articleWithNoStock.getId()); + + Assert.assertTrue(articleUnavailable); + + EntityManager entityManager = getJpaEntityManagerRule().newEntityManager(); + + UnavailableArticleJpaDao unavailableArticleJpaDao = + new UnavailableArticleJpaDao(entityManager); + + List<UnavailableArticle> allUnavailableArticles = unavailableArticleJpaDao.findAll(); + + Assert.assertEquals(1, allUnavailableArticles.size()); + + Assert.assertEquals(articleWithNoStock, allUnavailableArticles.get(0).getArticle()); + + } + } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java 2013-07-13 15:17:38 UTC (rev 315) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java 2013-07-22 14:30:01 UTC (rev 316) @@ -32,6 +32,7 @@ import com.franciaflex.magalie.services.exception.ArticleNotAvailableForKanbanException; import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; import com.franciaflex.magalie.services.service.FulfilKanbanService; +import com.franciaflex.magalie.services.service.RealTimeStorageMovementTask; import com.franciaflex.magalie.web.Activity; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; @@ -165,14 +166,26 @@ MagalieUser magalieUser = session.getMagalieUser(); - if (service.isArticleUnavailable(building, magalieUser, article.getId())) { + // just to check that user will be able to get something + RealTimeStorageMovementTask realTimeStorageMovementTask = + service.getRealTimeStorageMovementTask(building, magalieUser, article.getId()); + if (realTimeStorageMovementTask.isArticleUnavailable()) { + addActionError("Article sans stock"); return INPUT; } + if (realTimeStorageMovementTask.isDriverLicenseRequired()) { + + addActionError("Article inaccessible sans permis"); + + return INPUT; + + } + try { quantity = service.getDefinedQuantity(article, destinationWarehouse); Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-07-13 15:17:38 UTC (rev 315) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-07-22 14:30:01 UTC (rev 316) @@ -52,6 +52,9 @@ Article </th> <th> + Quantité réelle + </th> + <th> Utilisateur </th> <th> @@ -84,6 +87,9 @@ <s:property value="article.code" /> </td> <td> + <s:property value="actualQuantity" /> <s:property value="article.unit" /> + </td> + <td> <a href="#<s:property value="magalieUser.id" />"><s:property value="magalieUser.login" /></a> </td> <td> Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-07-13 15:17:38 UTC (rev 315) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-07-22 14:30:01 UTC (rev 316) @@ -301,15 +301,54 @@ onConfirm : function() { - // push model as Json in a hidden field - $('#withdraw-item_confirmation').val(JSON.stringify(model.getConfirmation())); + var barcode = $('#withdraw-item_locationBarcode').val(); - model.forceConfirm = true; + if (barcode.length > 0) { - $('#withdraw-item').submit(); + controller.onNext(); + } + + var confirmation = model.getConfirmation(); + + var confirmMessage = 'Confirmer ' + confirmation.storageMovementIds.length + ' mouvements ?'; + + if (confirm(confirmMessage)) { + + // push model as Json in a hidden field + $('#withdraw-item_confirmation').val(JSON.stringify(confirmation)); + + model.forceConfirm = true; + + $('#withdraw-item').submit(); + + } + }, + onCancel : function(e) { + + var confirmation = model.getConfirmation(); + + var confirmMessage = 'Annuler ' + confirmation.storageMovementIds.length + ' mouvements ?'; + + var redirect = confirmation.storageMovementIds.length == 0 + || confirm(confirmMessage); + + if (redirect) { + + redirectTo($('#cancelLink')); + + } else { + + if (e) { + e.preventDefault(); + } + + } + + }, + onSubmit : function(e) { if (model.forceConfirm) { @@ -331,9 +370,11 @@ $('#reportCancel').click(controller.onCancel); $('#withdraw-item_next').click(controller.onNext); $('#confirm').click(controller.onConfirm); + $('#cancelLink').click(controller.onCancel); + bindKey('F4', controller.onConfirm); bindKey('F5', controller.onReportError); - bindKey('Esc', function(){ redirectTo($('#cancelLink'));}); + bindKey('Esc', controller.onCancel); controller.onShowFirstLocation(); view.refresh(); });

1 0

Jenkins build became unstable: franciaflex-magalie #86
by admin+hudson＠codelutin.com July 15, 2013

July 15, 2013

See <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/86/changes>

1 5

Jenkins build is back to normal : franciaflex-magalie » MagaLiE #91
by admin+hudson＠codelutin.com July 15, 2013

July 15, 2013

See <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/com.franciaflex$magali…>

1 0