1. Juan Carlos Picado Herrera
  2. encuestame

Commits

Paola Morales  committed 74ef507 Merge

Merge branch 'dianmorales' into juanpicado

  • Participants
  • Parent commits 0f9fb58, c4a41b9
  • Branches master

Comments (0)

Files changed (2)

File encuestame-core/src/main/java/org/encuestame/core/util/ConvertDomainBean.java

View file
  • Ignore whitespace
             unitUserBean.setGroupBean(convertGroupDomainToBean(secUserSecondary.getGroup()));
             unitUserBean.setGroupId(secUserSecondary.getGroup() == null ? null : secUserSecondary.getGroup().getGroupId());
             unitUserBean.setListPermission(convertSetToUnitPermission(secUserSecondary.getSecUserPermissions()));
-            unitUserBean.setFollowers(secUserSecondary.getFollowers());
             //System.out.println("Convert Enjoy Date "+secUserSecondary.getEnjoyDate());
             unitUserBean.setDateNew(secUserSecondary.getEnjoyDate());
             //System.out.println("Convert Enjoy Date 1"+unitUserBean.getDateNew());

File encuestame-mvc/src/main/java/org/encuestame/mvc/controller/security/json/JsonUsersController.java

View file
  • Ignore whitespace
 
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
-import org.encuestame.core.util.DateUtil;
 import org.encuestame.core.util.RelativeTimeEnum;
 import org.encuestame.mvc.controller.AbstractJsonController;
 import org.encuestame.mvc.controller.validation.ControllerValidation;