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

Formatierungen etc 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2545 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2014-02-28 08:47:57 +00:00
parent 4c10207c82
commit 06b2bbb509
3 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactTable.java
View File

@ -44,6 +44,7 @@ import com.arsdigita.cms.dispatcher.ItemResolver;
import com.arsdigita.cms.util.GlobalizationUtil; import com.arsdigita.cms.util.GlobalizationUtil;
import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.globalization.GlobalizationHelper; import com.arsdigita.globalization.GlobalizationHelper;
import com.arsdigita.globalization.GlobalizedMessage;
import com.arsdigita.util.LockableImpl; import com.arsdigita.util.LockableImpl;
import java.math.BigDecimal; import java.math.BigDecimal;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
@ -318,7 +319,7 @@ public class GenericPersonContactTable extends Table implements
globalize("cms.contenttypes.ui.person.confirm_delete")); globalize("cms.contenttypes.ui.person.confirm_delete"));
return link; return link;
} else { } else {
return new Label(value.toString()); return new Label((GlobalizedMessage) value);
} }
} }
} }

8
ccm-sci-bundle/bundles/devel/cfg/project.xml
View File

@ -9,7 +9,7 @@
name="ScientificCMS" name="ScientificCMS"
prettyName="Scientific CMS" prettyName="Scientific CMS"
version="2.2.0" version="2.2.0"
release="SNAPSHOT-r2517" release="devel-SNAPSHOT-r2540"
webxml="web-sci.xml" webxml="web-sci.xml"
webapp="ROOT" webapp="ROOT"
xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd"> xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
@ -111,6 +111,8 @@
<ccm:application name="ccm-docrepo"/> <ccm:application name="ccm-docrepo"/>
<ccm:application name="ccm-forum"/> <ccm:application name="ccm-forum"/>
<ccm:application name="ccm-cms-portletdataprovider"/>
<!-- Extended Bundle's SCI extensions --> <!-- Extended Bundle's SCI extensions -->
@ -167,9 +169,9 @@
<!-- <!--
<ccm:application name="ccm-atoz"/> <ccm:application name="ccm-atoz"/>
<ccm:application name="ccm-atoz-siteproxy"/> <ccm:application name="ccm-atoz-siteproxy"/>
<ccm:application name="ccm-ldn-atoz"/> <ccm:application name="ccm-ldn-atoz"/> -->
<ccm:application name="ccm-docmgr"/> <ccm:application name="ccm-docmgr"/>
-->
<!-- some minor program issues --> <!-- some minor program issues -->
<ccm:application name="ccm-portalserver"/> <ccm:application name="ccm-portalserver"/>

44
ccm-sci-publicationscsvimporter/application.xml
View File

@ -1,30 +1,30 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
name="ccm-sci-publicationscsvimporter" name="ccm-sci-publicationscsvimporter"
version="6.6.0" version="6.6.0"
release="1" release="1"
webapp="ROOT"> webapp="ROOT">
<ccm:dependencies> <ccm:dependencies>
<ccm:requires name="ccm-core" version="6.6.0" relation="ge"/> <ccm:requires name="ccm-core" version="6.6.0" relation="ge"/>
<ccm:requires name="ccm-cms" version="6.6.6" relation="ge"/> <ccm:requires name="ccm-cms" version="6.6.6" relation="ge"/>
<ccm:requires name="ccm-cms-assets-relatedlink" version="6.6.1" relation="ge"/> <ccm:requires name="ccm-cms-assets-relatedlink" version="6.6.1" relation="ge"/>
<ccm:requires name="ccm-sci-publications" version="6.6.3" relation="ge"/> <ccm:requires name="ccm-sci-publications" version="6.6.3" relation="ge"/>
<!--<ccm:requires name="ccm-sci-publications-researchreport" version="6.6.3" relation="ge"/>--> <!--<ccm:requires name="ccm-sci-publications-researchreport" version="6.6.3" relation="ge"/>-->
</ccm:dependencies> </ccm:dependencies>
<ccm:directories> <ccm:directories>
<ccm:directory name="src"/> <ccm:directory name="src"/>
</ccm:directories> </ccm:directories>
<ccm:contacts> <ccm:contacts>
<ccm:contact uri="http://www.scientificcms.org" type="website"/> <ccm:contact uri="http://www.scientificcms.org" type="website"/>
<ccm:contact uri="mailto:info@scientificcms.org" type="support"/> <ccm:contact uri="mailto:info@scientificcms.org" type="support"/>
</ccm:contacts> </ccm:contacts>
<ccm:description> <ccm:description>
Importer for Publications using a CSV file. Only used for internal purposes Importer for Publications using a CSV file. Only used for internal purposes
at the University of Bremen. at the University of Bremen.
</ccm:description> </ccm:description>
</ccm:application> </ccm:application>