This is an automated email from the git hooks/post-receive script. New commit to branch feature/882 in repository chorem. See http://git.chorem.org/chorem.git commit 8af2c93288be9d78cf5be582dfd77cb43cbd72ee Author: kootox <jean.couteau@gmail.com> Date: Fri Jan 30 15:52:57 2015 +0100 refs #882 : fix cards rendering --- .../main/java/org/chorem/webmotion/actions/crm/CompaniesAction.java | 4 ---- .../src/main/webapp/WEB-INF/jsp/crm/cards/contactDetailsListCard.jsp | 2 ++ .../src/main/webapp/WEB-INF/jsp/crm/cards/employeesListCard.jsp | 4 +++- .../src/main/webapp/WEB-INF/jsp/crm/cards/notesListCard.jsp | 2 ++ 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/CompaniesAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/CompaniesAction.java index d282feb..ab0c2ad 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/CompaniesAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/CompaniesAction.java @@ -53,7 +53,6 @@ public class CompaniesAction extends WebMotionController { "contactDetails", contactDetails, "employees", employees, "notes", notes); - } public List<Note> listNotes(ChoremClient client, String companyId) { @@ -61,7 +60,6 @@ public class CompaniesAction extends WebMotionController { .exteq(Note.EXT_NOTE) .eq(Note.FQ_FIELD_NOTE_TARGET, companyId).end(); List<Note> notes = client.findAllByQuery(Note.class, notesQuery).getAll(); - return notes; } @@ -70,7 +68,6 @@ public class CompaniesAction extends WebMotionController { .exteq(ContactDetails.EXT_CONTACTDETAILS) .eq(ContactDetails.FQ_FIELD_CONTACTDETAILS_TARGET, companyId).end(); List<ContactDetails> contactDetails = client.findAllByQuery(ContactDetails.class, contactDetailsQuery).getAll(); - return contactDetails; } @@ -79,7 +76,6 @@ public class CompaniesAction extends WebMotionController { .exteq(Employee.EXT_EMPLOYEE) .eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).end(); List<Employee> employees = client.findAllByQuery(Employee.class, employeesQuery).getAll(); - return employees; } } diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/cards/contactDetailsListCard.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/cards/contactDetailsListCard.jsp index 3f42b1e..241cbb8 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/cards/contactDetailsListCard.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/cards/contactDetailsListCard.jsp @@ -1,5 +1,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + <div class="panel panel-default"> <div class="panel-heading clearfix"> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/cards/employeesListCard.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/cards/employeesListCard.jsp index 10cb08e..1b918df 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/cards/employeesListCard.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/cards/employeesListCard.jsp @@ -1,4 +1,6 @@ - <%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@page contentType="text/html" pageEncoding="UTF-8"%> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <div id="contactCard"> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/cards/notesListCard.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/cards/notesListCard.jsp index 56f91db..78606e3 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/cards/notesListCard.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/cards/notesListCard.jsp @@ -1,5 +1,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + <div class="panel panel-default"> <div class="panel-heading clearfix"> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.