Author: kmorin Date: 2014-12-03 12:42:49 +0000 (Wed, 03 Dec 2014) New Revision: 717 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/717 Log: fixes #6238 Erreur quand on ouvre un ?\195?\169l?\195?\169ment group?\195?\169 refs #6237 La recherche pour grouper se lance parfois toute seule ?\195?\160 l'ouverture de l'?\195?\169cran Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-12-03 09:10:22 UTC (rev 716) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-12-03 12:42:49 UTC (rev 717) @@ -1076,7 +1076,7 @@ EmailGroupTopiaDao groupDao = getPersistenceContext().getEmailGroupDao(); Email email1 = getFullEmailById(email1Id, user); - Email email2 = getEmailById(email2Id); + Email email2 = getFullEmailById(email2Id, user); EmailGroup group1 = email1.getEmailGroup(); EmailGroup group2 = email2.getEmailGroup(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java 2014-12-03 09:10:22 UTC (rev 716) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java 2014-12-03 12:42:49 UTC (rev 717) @@ -64,7 +64,6 @@ @Override public void doAction() throws Exception { SearchUIModel model = getModel(); - getContext().setSearch(model); SearchFilter searchFilter = model.toEntity(); FaxToMailServiceContext serviceContext = getContext().newServiceContext(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-12-03 09:10:22 UTC (rev 716) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-12-03 12:42:49 UTC (rev 717) @@ -90,25 +90,14 @@ public void beforeInit(SearchToGroupUI ui) { super.beforeInit(ui); - SearchUIModel searchUIModel = getContext().getSearch(); - if (searchUIModel == null) { - searchUIModel = new SearchUIModel(); -// searchUIModel.setTakenBy(getContext().getCurrentUser()); -// searchUIModel.setModifiedBy(getContext().getCurrentUser()); + SearchUIModel searchUIModel = new SearchUIModel(); + Date now = new Date(); + Calendar cal = Calendar.getInstance(); + cal.add(Calendar.MONTH, -2); + Date twoMonthsAgo = cal.getTime(); + searchUIModel.setMaxReceptionDate(now); + searchUIModel.setMinReceptionDate(twoMonthsAgo); - Date now = new Date(); - Calendar cal = Calendar.getInstance(); - cal.add(Calendar.MONTH, -2); - Date twoMonthsAgo = cal.getTime(); - -// searchUIModel.setMaxModificationDate(now); -// searchUIModel.setMinModificationDate(twoMonthsAgo); - searchUIModel.setMaxReceptionDate(now); - searchUIModel.setMinReceptionDate(twoMonthsAgo); - //searchUIModel.setMaxPrintingDate(now); - //searchUIModel.setMinPrintingDate(twoMonthsAgo); - } - getUI().setContextValue(searchUIModel); }