Skip to content

Commit

Permalink
Merge pull request #2 from DPIRPSG/Miguel
Browse files Browse the repository at this point in the history
Problema corregido
  • Loading branch information
migrodcab committed Dec 3, 2015
2 parents b316af3 + 5849fe7 commit 27aeb58
Showing 1 changed file with 5 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,21 @@
import org.springframework.web.servlet.ModelAndView;

import services.CurriculumService;
import services.CustomerService;

import controllers.AbstractController;
import domain.Curriculum;
import domain.Customer;

// TODO: implement this controller.

@Controller
@RequestMapping(value = "curriculum/customer")
@RequestMapping(value = "/curriculum/customer")
public class CurriculumCustomerController extends AbstractController {

//Services ----------------------------------------------------------

@Autowired
private CurriculumService curriculumService;

@Autowired
private CustomerService customerService;

//Constructors ----------------------------------------------------------

public CurriculumCustomerController() {
Expand All @@ -55,12 +50,11 @@ public CurriculumCustomerController() {
@RequestMapping(value = "/list", method = RequestMethod.GET)
public ModelAndView list() {
ModelAndView result;
Collection<Curriculum> curriculums;

curriculums = curriculumService.findByPrincipal();
Collection<Curriculum> curricula;

curricula = curriculumService.findByPrincipal();
result = new ModelAndView("curriculum/list");
result.addObject("curricula", curriculums);
result.addObject("curricula", curricula);

return result;
}
Expand Down Expand Up @@ -136,13 +130,9 @@ protected ModelAndView createEditModelAndView(Curriculum curriculum) {

protected ModelAndView createEditModelAndView(Curriculum curriculum, String message) {
ModelAndView result;
Customer customer;

customer = customerService.findByPrincipal();


result = new ModelAndView("curriculum/edit");
result.addObject("curriculum", curriculum);
result.addObject("customer", customer);
result.addObject("message", message);

return result;
Expand Down

0 comments on commit 27aeb58

Please sign in to comment.