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

Einige kleinere Korrekturen 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1286 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2011-11-21 18:48:42 +00:00
parent 2e311ef532
commit a90aae7cda
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ccm-sci-bundle/src/com/arsdigita/bundle/ui/GenericOrgaUnitTabComponent.java
View File

@ -59,7 +59,8 @@ public class GenericOrgaUnitTabComponent extends AbstractComponent {
GenericOrganizationalUnit orgaunit = GenericOrganizationalUnit orgaunit =
(GenericOrganizationalUnit) DomainObjectFactory. (GenericOrganizationalUnit) DomainObjectFactory.
newInstance(orgaunitOid); newInstance(orgaunitOid);
if (!DispatcherHelper.getDispatcherPrefix(request).equals("preview")) { if ((DispatcherHelper.getDispatcherPrefix(request) == null)
|| !DispatcherHelper.getDispatcherPrefix(request).equals("preview")) {
orgaunit = (GenericOrganizationalUnit) orgaunit.getLiveVersion(); orgaunit = (GenericOrganizationalUnit) orgaunit.getLiveVersion();
} }

3
ccm-sci-publications/src/ccm-sci-publications.upgrade
View File

@ -2,4 +2,7 @@
<version from="6.6.0" to="6.6.1"> <version from="6.6.0" to="6.6.1">
<script sql="ccm-sci-publications/upgrade/::database::-6.6.0-6.6.1.sql"/> <script sql="ccm-sci-publications/upgrade/::database::-6.6.0-6.6.1.sql"/>
</version> </version>
<version from="6.6.1" to="6.6.2">
<script sql="ccm-sci-publications/upgrade/::database::-6.6.1-6.6.2.sql"/>
</version>
</upgrade> </upgrade>

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

@ -96,7 +96,7 @@ public class SciInstituteProjectsTab implements GenericOrgaUnitTab {
final HttpServletRequest request = state.getRequest(); final HttpServletRequest request = state.getRequest();
final Element depProjectsElem = parent.newChildElement( final Element depProjectsElem = parent.newChildElement(
"departmentProjects"); "instituteProjects");
final Element filtersElem = depProjectsElem.newChildElement( final Element filtersElem = depProjectsElem.newChildElement(
"filters"); "filters");

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

@ -66,6 +66,7 @@ public class SciInstituteSummaryTab implements GenericOrgaUnitTab {
final long start = System.currentTimeMillis(); final long start = System.currentTimeMillis();
if ((department != null) if ((department != null)
&& (department.getInstituteShortDescription() != null)
&& !department.getInstituteShortDescription().trim().isEmpty()) { && !department.getInstituteShortDescription().trim().isEmpty()) {
final Element shortDescElem = parent.newChildElement("shortDesc"); final Element shortDescElem = parent.newChildElement("shortDesc");
shortDescElem.setText(department.getInstituteShortDescription()); shortDescElem.setText(department.getInstituteShortDescription());