LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Verschiedene Bug Fixes. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1299 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2011-11-25 20:32:55 +00:00
parent 3cc4bdba14
commit 42694b6dad
8 changed files with 47 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-navigation/src/com/arsdigita/navigation/ui/GreetingItem.java
View File

@ -66,7 +66,7 @@ public class GreetingItem extends AbstractComponent {
return null;
}
if (!ContentItem.VERSION.equals(item.getVersion())) {
if (!ContentItem.LIVE.equals(item.getVersion())) {
item = item.getLiveVersion();
}

2
ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentProjectsTab.java
View File

@ -172,7 +172,7 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab {
subDepartmentsQuery.setParameter("orgaunitId",
orgaunit.getID().toString());
subDepartmentsQuery.setParameter("assocType",
SciDepartmentProjectsStep.ASSOC_TYPE);
SciDepartmentSubDepartmentsStep.ASSOC_TYPE);
while (subDepartmentsQuery.next()) {
/*if (projectsFilter.length() > 0) {

7
ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentPublicationsTab.java
View File

@ -112,7 +112,7 @@ public class SciDepartmentPublicationsTab implements GenericOrgaUnitTab {
depPublicationsElem.newChildElement("greeting");
publications.addOrder("year");
publications.addOrder("year desc");
if (config.getOneRowPerAuthor()) {
publications.addOrder("surname");
} else {
@ -172,6 +172,7 @@ public class SciDepartmentPublicationsTab implements GenericOrgaUnitTab {
publications.addOrder("year asc");
}*/
publications.addOrder("year desc");
if (config.getOneRowPerAuthor()) {
publications.addOrder("surname");
publications.addOrder("title");
@ -180,7 +181,7 @@ public class SciDepartmentPublicationsTab implements GenericOrgaUnitTab {
publications.addOrder("title");
}
yearFilter.setDataQuery(publications, "year");
yearFilter.setDataQuery(getData(orgaunit), "year");
applyYearFilter(publications, request);
applyTitleFilter(publications, request);
@ -351,7 +352,7 @@ public class SciDepartmentPublicationsTab implements GenericOrgaUnitTab {
final long start = System.currentTimeMillis();
final XmlGenerator generator = new XmlGenerator(publication);
generator.setUseExtraXml(false);
generator.setItemElemName("publication", "");
generator.setItemElemName("publications", "");
generator.generateXML(state, parent, "");
logger.debug(String.format(
"Generated XML for publication '%s' in %d ms.",

2
ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteProjectsTab.java
View File

@ -175,7 +175,7 @@ public class SciInstituteProjectsTab implements GenericOrgaUnitTab {
subDepartmentsQuery.setParameter("orgaunitId",
orgaunit.getID().toString());
subDepartmentsQuery.setParameter("assocType",
SciInstituteProjectsStep.ASSOC_TYPE);
SciInstituteDepartmentsStep.ASSOC_TYPE);
while (subDepartmentsQuery.next()) {
/*if (projectsFilter.length() > 0) {

4
ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstitutePublicationsTab.java
View File

@ -138,7 +138,7 @@ public class SciInstitutePublicationsTab implements GenericOrgaUnitTab {
publicationsElem.newChildElement("greeting");
publications.addOrder("year");
publications.addOrder("year desc");
if (config.getOneRowPerAuthor()) {
publications.addOrder("surname");
} else {
@ -374,7 +374,7 @@ public class SciInstitutePublicationsTab implements GenericOrgaUnitTab {
final long start = System.currentTimeMillis();
final XmlGenerator generator = new XmlGenerator(publication);
generator.setUseExtraXml(false);
generator.setItemElemName("publication", "");
generator.setItemElemName("publications", "");
generator.generateXML(state, parent, "");
logger.debug(String.format(
"Generated XML for publication '%s' in %d ms.",

6
ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTab.java
View File

@ -54,8 +54,10 @@ public class SciInstituteSummaryTab implements GenericOrgaUnitTab {
if (config.isShowingHead()) {
generateHeadOfInstituteXml(institute, instituteSummaryElem, state);
}
generateDepartmentsXml(institute, instituteSummaryElem, state);
if (config.isShowingDepartments()) {
generateDepartmentsXml(institute, instituteSummaryElem, state);
}
logger.debug(String.format("Generated XML for summary tab of institute "
+ "'%s' in %d ms.",

30
ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTabConfig.java
View File

@ -11,46 +11,58 @@ import com.arsdigita.util.parameter.StringParameter;
* @version $Id$
*/
public class SciInstituteSummaryTabConfig extends AbstractConfig {
private final Parameter showHeads;
private final Parameter headRole;
private final Parameter activeStatus;
private final Parameter showDepartments;
public SciInstituteSummaryTabConfig() {
showHeads =
new BooleanParameter(
"com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.show",
Parameter.REQUIRED,
true);
headRole =
new StringParameter(
"com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.role",
Parameter.REQUIRED,
"head");
activeStatus =
new StringParameter(
"com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.status.active",
Parameter.REQUIRED,
"active");
showDepartments =
new BooleanParameter(
"com.arsdigita.cms.contenttypes.sciinstitute.summarytab.departments.show",
Parameter.REQUIRED,
true);
register(showHeads);
register(headRole);
register(activeStatus);
register(showDepartments);
loadInfo();
}
public final boolean isShowingHead() {
return (Boolean) get(showHeads);
}
public final String getHeadRole() {
return (String) get(headRole);
}
public final String getActiveStatus() {
return (String) get(activeStatus);
}
public final Boolean isShowingDepartments() {
return (Boolean) get(showDepartments);
}
}

21
ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTabConfig_parameter.properties
View File

@ -3,12 +3,17 @@ com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.show.purpose = Show
com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.show.example = true
com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.show.format = [Boolean]
com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.role = Role of the heads of the institute
com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.role = Role of the heads of the institute. This is an attribute of the association between GenericOrganizationalUnit and GenericPerson. This value may contains more than value, separated by ','.
com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.role = active,heading
com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.role = [String]
com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.role.title = Role of the heads of the institute
com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.role.purpose = Role of the heads of the institute. This is an attribute of the association between GenericOrganizationalUnit and GenericPerson. This value may contains more than value, separated by ','.
com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.role.example = active,heading
com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.role.format = [String]
com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.status.active = Status of active members
com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.status.active = Status of the active members of the institute. Used to filter out former heads. This is an attribute of the association between GenericOrganizationalUnit and GenericPerson. This value may contains more than value, separated by ','.
com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.status.active = former,formerHead
com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.status.active = [String]
com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.status.active.title = Status of active members
com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.status.active.purpose = Status of the active members of the institute. Used to filter out former heads. This is an attribute of the association between GenericOrganizationalUnit and GenericPerson. This value may contains more than value, separated by ','.
com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.status.active.example = former,formerHead
com.arsdigita.cms.contenttypes.sciinstitute.summarytab.heads.status.active.format = [String]
com.arsdigita.cms.contenttypes.sciinstitute.summarytab.departments.show.title = Show departments?
com.arsdigita.cms.contenttypes.sciinstitute.summarytab.departments.show.purpose = Show departments?
com.arsdigita.cms.contenttypes.sciinstitute.summarytab.departments.show.example = true
com.arsdigita.cms.contenttypes.sciinstitute.summarytab.departments.show.format = [Boolean]