Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1724 → Rev 1725

/branches/v3/impl/src/web/user/repositoryDocuments/adminInterfaceBuilder.jsp
164,7 → 164,14
"showTitle" : true,
"showDescription" : false,
"cols" : 6,
"type" : "block"
"type" : "block",
"orderBy" : "publishDateDesc",
"tree": false,
"showDocumentMetaData" : false,
"datesFormat" : "YY",
"showFileTitle" : true,
"showFileDescription": false
 
}
);
}
/branches/v3/impl/src/web/user/repositoryDocuments/showInterface.jsp
207,10 → 207,11
${interfaceBlock.title}
</div>
</logic:equal>
 
<baco:hasRole role="admin,all,repositoryDocs">
<logic:notEmpty name="interfaceBlock" property="collectionIds">
<%
if(collections != null && collections.size() == 1)
if(collections != null && collections.size() == 1 && !interfaceBlock.isTree())
{
request.setAttribute("colToAdd",collections.get(0));
%>
/branches/v3/impl/src/web/user/repositoryDocuments/showInterfaceColFragment.jsp
33,16 → 33,7
</div>
<div class="repository-document-collection-childs">
<%
if(collection.getChilds() != null && collection.getChilds().size()>0)
{
for(RepositoryDocumentCollection child: collection.getChilds())
{
request.setAttribute("collection",child);
%>
<jsp:include page="showInterfaceColFragment.jsp"/>
<%
}
}
 
Criteria c = AbstractDao.getCurrentSession().createCriteria(RepositoryDocument.class);
 
c.add(eq("collection.id",collection.getId()));
82,6 → 73,21
<%
}
 
//SUBCOLECOES
 
if(collection.getChilds() != null && collection.getChilds().size()>0)
{
for(RepositoryDocumentCollection child: collection.getChilds())
{
if(!child.isVisible())
continue;
request.setAttribute("collection",child);
%>
<jsp:include page="showInterfaceColFragment.jsp"/>
<%
}
}
 
%>
 
</div>