--- a/server/src/main/java/org/iri_research/renkan/controller/RenkanRootController.java Mon Oct 21 13:58:20 2013 +0200
+++ b/server/src/main/java/org/iri_research/renkan/controller/RenkanRootController.java Mon Oct 21 15:00:17 2013 +0200
@@ -27,62 +27,70 @@
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.servlet.ModelAndView;
-
@Controller
@RequestMapping("/")
public class RenkanRootController {
- private final Logger logger = LoggerFactory.getLogger(RenkanRootController.class);
-
- @Autowired
- private ProjectsRepository projectsRepository;
-
- @Autowired
- private SpacesRepository spacesRepository;
-
- @RequestMapping(value="", method = RequestMethod.GET, produces={"text/html;charset=UTF-8"})
- public String renkanIndex(Model model, @PageableDefaults(sort={"created"}, sortDir=Direction.DESC, pageNumber=0, value=Constants.PAGINATION_SIZE) Pageable p, HttpServletRequest request) {
+ private final Logger logger = LoggerFactory
+ .getLogger(RenkanRootController.class);
+
+ @Autowired
+ private ProjectsRepository projectsRepository;
+
+ @Autowired
+ private SpacesRepository spacesRepository;
+
+ @RequestMapping(value = "", method = RequestMethod.GET, produces = { "text/html;charset=UTF-8" })
+ public String renkanIndex(
+ Model model,
+ @PageableDefaults(sort = { "created" }, sortDir = Direction.DESC, pageNumber = 0, value = Constants.PAGINATION_SIZE) Pageable p,
+ HttpServletRequest request) {
- Page<Space> page = this.spacesRepository.findAll(p);
-
- model.addAttribute("page", page);
- model.addAttribute("baseUrl", Utils.buildBaseUrl(request));
- model.addAttribute("projectsCount", this.projectsRepository.getCountBySpace());
-
- return "renkanIndex";
- }
+ Page<Space> page = this.spacesRepository.findAll(p);
+
+ model.addAttribute("page", page);
+ model.addAttribute("baseUrl", Utils.buildBaseUrl(request));
+ model.addAttribute("projectsCount",
+ this.projectsRepository.getCountBySpace());
- @RequestMapping(value="/s/{space_id}", method = RequestMethod.GET, produces={"text/html;charset=UTF-8"})
- public ModelAndView spaceIndex(@PathVariable("space_id") String spaceId, @RequestParam(required=false) String filter, @PageableDefaults(sort={"updated","created"}, sortDir=Direction.DESC, pageNumber=0, value=Constants.PAGINATION_SIZE) Pageable p, HttpServletRequest request) {
-
- logger.debug("SpaceId : " + (spaceId== null ? "null" : spaceId));
-
- Map<String, Object> model = new HashMap<String, Object>();
+ return "renkanIndex";
+ }
+
+ @RequestMapping(value = "/s/{space_id}", method = RequestMethod.GET, produces = { "text/html;charset=UTF-8" })
+ public ModelAndView spaceIndex(
+ @PathVariable("space_id") String spaceId,
+ @RequestParam(required = false) String filter,
+ @PageableDefaults(sort = { "updated", "created" }, sortDir = Direction.DESC, pageNumber = 0, value = Constants.PAGINATION_SIZE) Pageable p,
+ HttpServletRequest request) {
- if("_".equals(spaceId)) {
- spaceId = null;
- }
-
- Space space = this.spacesRepository.findOne(spaceId);
-
- if(null == space) {
- throw new HttpClientErrorException(HttpStatus.NOT_FOUND, "Space " + spaceId + " not found.");
- }
-
- model.put("space", space);
- Page<Project> page;
- if(filter != null && !filter.isEmpty()) {
- page = this.projectsRepository.findBySpaceIdAndTitleRegex(spaceId, filter, p);
- }
- else {
- page = this.projectsRepository.findBySpaceId(spaceId, p);
- }
-
- model.put("page", page);
- model.put("baseUrl", Utils.buildBaseUrl(request));
-
- return new ModelAndView("projectIndex", model);
- }
-
-
+ logger.debug("SpaceId : " + (spaceId == null ? "null" : spaceId));
+
+ Map<String, Object> model = new HashMap<String, Object>();
+
+ if ("_".equals(spaceId)) {
+ spaceId = null;
+ }
+
+ Space space = this.spacesRepository.findOne(spaceId);
+
+ if (null == space) {
+ throw new HttpClientErrorException(HttpStatus.NOT_FOUND, "Space "
+ + spaceId + " not found.");
+ }
+
+ model.put("space", space);
+ Page<Project> page;
+ if (filter != null && !filter.isEmpty()) {
+ page = this.projectsRepository.findBySpaceIdAndTitleRegex(spaceId,
+ filter, p);
+ } else {
+ page = this.projectsRepository.findBySpaceId(spaceId, p);
+ }
+
+ model.put("page", page);
+ model.put("baseUrl", Utils.buildBaseUrl(request));
+
+ return new ModelAndView("projectIndex", model);
+ }
+
}