Rev 1716 | Rev 1725 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1716 | Rev 1717 | ||
---|---|---|---|
Line 37... | Line 37... | ||
37 | { |
37 | { |
38 | for(RepositoryDocumentCollection child: collection.getChilds()) |
38 | for(RepositoryDocumentCollection child: collection.getChilds()) |
39 | { |
39 | { |
40 | request.setAttribute("collection",child); |
40 | request.setAttribute("collection",child); |
41 | %> |
41 | %> |
42 | <jsp:include page="showInterfaceDocsFragment.jsp"/> |
42 | <jsp:include page="showInterfaceColFragment.jsp"/> |
43 | <% |
43 | <% |
44 | } |
44 | } |
45 | } |
45 | } |
46 | Criteria c = AbstractDao.getCurrentSession().createCriteria(RepositoryDocument.class); |
46 | Criteria c = AbstractDao.getCurrentSession().createCriteria(RepositoryDocument.class); |
47 | 47 | ||
48 | c.add(eq("collection.id",collection.getId())); |
48 | c.add(eq("collection.id",collection.getId())); |
49 | c.add(eq("visible",true)); |
49 | c.add(eq("visible",true)); |
50 | 50 | ||
51 | if(interfaceBlock.getOrderBy() == InterfaceBlock.Order.publishDateAsc) |
51 | if(interfaceBlock.getOrderBy() == InterfaceBlock.Order.publishDateAsc) |
52 | c.addOrder(Order.asc("publishDate")); |
52 | c.addOrder(Order.asc("publishDate")); |
53 | else if(interfaceBlock.getOrderBy() == InterfaceBlock.Order.publishDateDesc) |
53 | else if(interfaceBlock.getOrderBy() == InterfaceBlock.Order.publishDateDesc) |
54 | c.addOrder(Order.desc("publishDate")); |
54 | c.addOrder(Order.desc("publishDate")); |
55 | else if(interfaceBlock.getOrderBy() == InterfaceBlock.Order.saveDateAsc) |
55 | else if(interfaceBlock.getOrderBy() == InterfaceBlock.Order.saveDateAsc) |
56 | c.addOrder(Order.asc("saveDate")); |
56 | c.addOrder(Order.asc("saveDate")); |
57 | else if(interfaceBlock.getOrderBy() == InterfaceBlock.Order.saveDateDesc) |
57 | else if(interfaceBlock.getOrderBy() == InterfaceBlock.Order.saveDateDesc) |
58 | c.addOrder(Order.desc("saveDate")); |
58 | c.addOrder(Order.desc("saveDate")); |
59 | else if(interfaceBlock.getOrderBy() == InterfaceBlock.Order.updateDateAsc) |
59 | else if(interfaceBlock.getOrderBy() == InterfaceBlock.Order.updateDateAsc) |
60 | c.addOrder(Order.desc("updateDate")); |
60 | c.addOrder(Order.desc("updateDate")); |
61 | else if(interfaceBlock.getOrderBy() == InterfaceBlock.Order.updateDateDesc) |
61 | else if(interfaceBlock.getOrderBy() == InterfaceBlock.Order.updateDateDesc) |
62 | c.addOrder(Order.desc("updateDate")); |
62 | c.addOrder(Order.desc("updateDate")); |
63 | else if(interfaceBlock.getOrderBy() == InterfaceBlock.Order.title) |
63 | else if(interfaceBlock.getOrderBy() == InterfaceBlock.Order.title) |
64 | c.addOrder(Order.asc("title")); |
64 | c.addOrder(Order.asc("title")); |
65 | 65 | ||
66 | if(interfaceBlock.getMaxPublishDate() != null && interfaceBlock.getMaxPublishDate().getTime() > 0) |
66 | if(interfaceBlock.getMaxPublishDate() != null && interfaceBlock.getMaxPublishDate().getTime() > 0) |
67 | { |
67 | { |
68 | c.add(le("publishDate", interfaceBlock.getMaxPublishDate())); |
68 | c.add(le("publishDate", interfaceBlock.getMaxPublishDate())); |
69 | } |
69 | } |
70 | if(interfaceBlock.getMinPublishDate() != null && interfaceBlock.getMinPublishDate().getTime() > 0) |
70 | if(interfaceBlock.getMinPublishDate() != null && interfaceBlock.getMinPublishDate().getTime() > 0) |
71 | { |
71 | { |
72 | c.add(ge("publishDate", interfaceBlock.getMinPublishDate())); |
72 | c.add(ge("publishDate", interfaceBlock.getMinPublishDate())); |
73 | } |
73 | } |
74 | 74 | ||
75 | List<RepositoryDocument> documents = c.list(); |
75 | List<RepositoryDocument> documents = c.list(); |
76 | 76 | ||
77 | if(documents!=null && documents.size() > 0) |
77 | if(documents!=null && documents.size() > 0) |
78 | { |
78 | { |
79 | request.setAttribute("documents",documents); |
79 | request.setAttribute("documents",documents); |
80 | %> |
80 | %> |
81 | <jsp:include page="showInterfaceDocsFragment.jsp"/> |
81 | <jsp:include page="showInterfaceDocsFragment.jsp"/> |
82 | <% |
82 | <% |
83 | } |
83 | } |
84 | 84 | ||
85 | %> |
85 | %> |
86 | 86 | ||
87 | </div> |
87 | </div> |
88 | </div> |
88 | </div> |
89 | 89 |