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

- Ergänzung am InternetArticle: Feld für letzte Änderung durch Autor vorbereitet, einige Fehler (falsche Labels) in Form korrigiert 

- DaBIn-Importer: Externe werden jetzt in einem gemeinsamen Ordner abglegt
- Texte für Download bei den Arbeitspapieren können jetzt über die Import-Config-Datei des Importers konfiguriert werden
- Related Links Steps angepasst (Test steht noch aus)


git-svn-id: https://svn.libreccm.org/ccm/trunk@832 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2011-04-05 19:50:00 +00:00
parent 95284248cc
commit 0c83991283
11 changed files with 98 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/DaBInImporter.java
View File

@ -259,7 +259,7 @@ public class DaBInImporter extends Program {
projectsRootFolder = projectsSection.getRootFolder();
publicationsRootFolder = publicationsSection.getRootFolder();
authors = createFolder(personsRootFolder, "autoren", "Autoren");
authors = createFolder(personsRootFolder, "externe", "Externe");
contacts = createFolder(personsRootFolder, "kontaktdaten",
"Kontaktdaten");
@ -270,7 +270,9 @@ public class DaBInImporter extends Program {
organization = createFolder(root, "organisationen", "Organisation(en)");
persons = createFolder(personsRootFolder, "personen", "Personen");
//Personen sollen beim ZeS in den gleichen Ordner wie Autoren.
//persons = createFolder(personsRootFolder, "persons", "persons");
persons = authors;
projects = createFolder(projectsRootFolder, "projekte", "Projekte");
@ -2733,14 +2735,14 @@ public class DaBInImporter extends Program {
//bundle.save();
RelatedLink download = new RelatedLink();
download.setTitle("Download");
download.setTitle(config.getProperty("workingpaper.download.de"));
download.setTargetType(Link.INTERNAL_LINK);
download.setTargetItem(fsi);
download.setLinkOwner(workingPaperDe);
download = new RelatedLink();
download.setTitle("Download");
download.setTargetType(Link.INTERNAL_LINK);
download.setTargetType(config.getProperty("workingpaper.download.en"));
download.setTargetItem(fsi);
download.setLinkOwner(workingPaperEn);

12
ccm-cms/src/com/arsdigita/cms/ui/folder/FolderBrowser.java
View File

@ -250,7 +250,7 @@ public class FolderBrowser extends Table {
}
protected long getFolderSize() {
return m_folderSize;
return m_folderSize;
}
private class FolderTableModelBuilder
@ -286,14 +286,6 @@ public class FolderBrowser extends Table {
Folder.ItemCollection itemColl = (Folder.ItemCollection) m_itemColl.
get(s);
s_log.debug(String.format("itemColl.size = %d", itemColl.size()));
/*if (itemColl.size() < 20) {
s_log.debug("Setting filter invisible.");
m_filterForm.setVisible(s, false);
} else {
s_log.debug("Setting filter visible.");
m_filterForm.setVisible(s, true);
}*/
m_folderSize = itemColl.size();
if (s.getValue(m_filter) != null) {
@ -320,7 +312,7 @@ public class FolderBrowser extends Table {
if (itemColl == null) {
return 0;
}
if (state.getValue(m_filter) != null) {
itemColl.addFilter(String.format(
"lower(name) like lower('%s%%') or lower(displayName) like lower('%s%%')",

91
ccm-cms/src/com/arsdigita/cms/ui/folder/FolderManipulator.java
View File

@ -111,16 +111,16 @@ public class FolderManipulator extends SimpleContainer
private ItemView m_itemView;
private TargetSelector m_targetSelector;
private FilterForm m_filterForm;
private StringParameter m_filter = new StringParameter("filter");
private StringParameter m_filter = new StringParameter("filter");
public FolderManipulator(FolderSelectionModel folderSel) {
m_sources = new ArrayParameter(new BigDecimalParameter("srcs"));
m_action = new StringParameter("act");
m_srcFolderSel = folderSel;
s_log.debug("Adding filter form...");
m_filterForm = new FilterForm();
add(m_filterForm);
//s_log.debug("Adding filter form...");
//m_filterForm = new FilterForm();
//add(m_filterForm);
m_itemView = new ItemView();
m_itemView.addProcessListener(this);
@ -138,7 +138,7 @@ public class FolderManipulator extends SimpleContainer
public void register(Page p) {
super.register(p);
p.setVisibleDefault(m_targetSelector, false);
p.setVisibleDefault(m_filterForm, true);
//p.setVisibleDefault(m_filterForm, true);
p.addComponentStateParam(this, m_sources);
p.addComponentStateParam(this, m_action);
p.addComponentStateParam(this, m_filter);
@ -361,26 +361,27 @@ public class FolderManipulator extends SimpleContainer
m_folderTree.setCellRenderer(new FolderTreeCellRenderer());
Label l = new Label(new PrintListener() {
@Override
public void prepare(PrintEvent e) {
PageState s = e.getPageState();
Label t = (Label) e.getTarget();
int n = getSources(s).length;
Folder f = (Folder) m_srcFolderSel.getSelectedObject(s);
String msg = n + "&nbsp;" +
(String) globalize("cms.ui.folder.items").localize() + "&nbsp;" +
(String) globalize("cms.ui.folder.from").localize() +"&nbsp;/" +
f.getPathNoJsp() + "&nbsp;" +
(String) globalize("cms.ui.folder.to").localize();
if ( isMove(s) ) {
t.setLabel((String) globalize("cms.ui.folder.move").localize() +
"&nbsp;" + msg);
} else if ( isCopy(s) ) {
t.setLabel((String) globalize("cms.ui.folder.copy").localize() +
"&nbsp;" + msg);
}
public void prepare(PrintEvent e) {
PageState s = e.getPageState();
Label t = (Label) e.getTarget();
int n = getSources(s).length;
Folder f = (Folder) m_srcFolderSel.getSelectedObject(s);
String msg = n + "&nbsp;" + (String) globalize(
"cms.ui.folder.items").localize() + "&nbsp;" + (String) globalize(
"cms.ui.folder.from").localize() + "&nbsp;/" + f.
getPathNoJsp() + "&nbsp;" + (String) globalize(
"cms.ui.folder.to").localize();
if (isMove(s)) {
t.setLabel((String) globalize("cms.ui.folder.move").
localize() + "&nbsp;" + msg);
} else if (isCopy(s)) {
t.setLabel((String) globalize("cms.ui.folder.copy").
localize() + "&nbsp;" + msg);
}
});
}
});
l.setOutputEscaping(false);
add(l);
add(m_folderTree);
@ -449,7 +450,7 @@ public class FolderManipulator extends SimpleContainer
m_browser = new FolderBrowser(m_srcFolderSel);
m_browser.setFilterParameter(m_filter);
m_browser.setFilterForm(m_filterForm);
m_browser.setFilterForm(m_filterForm);
m_paginator = new Paginator((PaginationModelBuilder) m_browser.
getModelBuilder(),
ContentSection.getConfig().
@ -457,6 +458,11 @@ public class FolderManipulator extends SimpleContainer
panel.add(m_paginator);
panel.add(m_browser);
/*s_log.debug("Adding filter form...");
m_filterForm = new FilterForm((PaginationModelBuilder) m_browser.
getModelBuilder());
getPanel().add(m_filterForm);*/
m_checkboxGroup = new CheckboxGroup(m_sources);
panel.add(m_checkboxGroup);
@ -495,8 +501,10 @@ public class FolderManipulator extends SimpleContainer
// The renderer for the first column in the itemView table
private class CheckboxRenderer implements TableCellRenderer {
@Override
public Component getComponent(Table table, PageState state, Object value,
public Component getComponent(Table table, PageState state,
Object value,
boolean isSelected, Object key,
int row, int column) {
BigDecimal n = (BigDecimal) key;
@ -513,20 +521,23 @@ public class FolderManipulator extends SimpleContainer
FormSubmissionListener {
private SimpleContainer panel;
private boolean visible;
private PaginationModelBuilder modelBuilder;
public FilterForm() {
public FilterForm(PaginationModelBuilder modelBuilder) {
super("folderFilterForm");
// m_browser = browser;
s_log.debug("Creating filter form...");
this.modelBuilder = modelBuilder;
addProcessListener(this);
addInitListener(this);
addSubmissionListener(this);
panel = new BoxPanel(BoxPanel.HORIZONTAL);
ActionLink allLink = new ActionLink((String)globalize(
ActionLink allLink = new ActionLink((String) globalize(
"cms.ui.folder.filter.all").localize());
allLink.addActionListener(new ActionListener() {
@ -550,30 +561,32 @@ public class FolderManipulator extends SimpleContainer
});
panel.add(link);
}
/*panel.add(new Label("filter"));
panel.add(new TextField(m_filter));
panel.add(new Submit("filterFolderSubmit", "filter"));*/
add(panel);
}
public void process(FormSectionEvent fse) throws FormProcessException {
}
public void init(FormSectionEvent fse) throws FormProcessException {
public void init(FormSectionEvent fse) throws FormProcessException {
}
public void submitted(FormSectionEvent fse) throws FormProcessException {
}
@Override
public void setVisible(PageState state, boolean visible) {
s_log.debug("Setting visible to..." + visible);
panel.setVisible(state, visible);
super.setVisible(state, visible);
public void setVisible(boolean visible) {
this.visible = visible;
}
@Override
public boolean isVisible(PageState state) {
//return super.isVisible(state);
return visible;
}
}
@ -598,9 +611,9 @@ public class FolderManipulator extends SimpleContainer
* sources, any of the sources, and any subfolders of the sources.
*/
@Override
public Component getComponent (Tree tree, PageState state, Object value,
boolean isSelected, boolean isExpanded,
boolean isLeaf, Object key) {
public Component getComponent(Tree tree, PageState state, Object value,
boolean isSelected, boolean isExpanded,
boolean isLeaf, Object key) {
// Get the list of invalid folders once per request.
ArrayList invalidFolders = (ArrayList) m_invalidFolders.get(state);

2
ccm-sci-publications/pdl/com/arsdigita/content-types/InternetArticle.pdl
View File

@ -30,7 +30,9 @@ object type InternetArticle extends Publication {
Integer[0..1] numberOfPages = ct_internet_article.number_of_pages INTEGER;
String[0..1] edition = ct_internet_article.edition VARCHAR(256);
String[0..1] issn = ct_internet_article.issn VARCHAR(9);
Date[0..1] lastAccessed = ct_internet_article.last_accessed DATE;
Date[0..1] publicationDate = ct_internet_article.publicationDate DATE;
reference key (ct_internet_article.internet_article_id);
}

9
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/InternetArticle.java
View File

@ -40,6 +40,7 @@ public class InternetArticle extends Publication {
public static final String NUMBER_OF_PAGES = "numberOfPages";
public static final String EDITION = "edition";
public static final String ISSN = "issn";
public static final String LAST_ACCESSED = "lastAccessed";
public static final String PUBLICATION_DATE = "publicationDate";
public static final String BASE_DATA_OBJECT_TYPE =
"com.arsdigita.cms.contenttypes.InternetArticle";
@ -139,6 +140,14 @@ public class InternetArticle extends Publication {
set(ISSN, issn);
}
public Date getLastAccessed() {
return (Date) get(LAST_ACCESSED);
}
public void setLastAccessed(Date lastAccessed) {
set(LAST_ACCESSED, lastAccessed);
}
public Date getPublicationDate() {
return (Date) get(PUBLICATION_DATE);
}

4
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticlePropertiesStep.java
View File

@ -66,8 +66,8 @@ public class InternetArticlePropertiesStep extends PublicationPropertiesStep {
InternetArticle.ISSN);
sheet.add(PublicationGlobalizationUtil.globalize(
"publications.ui.internetarticle.publication_date"),
InternetArticle.PUBLICATION_DATE);
"publications.ui.internetarticle.lastAccessed"),
InternetArticle.LAST_ACCESSED);
return sheet;
}

12
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticlePropertyForm.java
View File

@ -106,10 +106,10 @@ public class InternetArticlePropertyForm
Calendar today = new GregorianCalendar();
add(new Label((String) PublicationGlobalizationUtil.globalize(
"publications.ui.internetarticle.publicationdate").
"publications.ui.internetarticle.lastAccessed").
localize()));
ParameterModel pubDateParam =
new DateParameter(InternetArticle.PUBLICATION_DATE);
new DateParameter(InternetArticle.LAST_ACCESSED);
com.arsdigita.bebop.form.Date pubDate =
new com.arsdigita.bebop.form.Date(
pubDateParam);
@ -129,8 +129,8 @@ public class InternetArticlePropertyForm
data.put(InternetArticle.NUMBER_OF_PAGES, article.getNumberOfPages());
data.put(InternetArticle.EDITION, article.getEdition());
data.put(InternetArticle.ISSN, article.getISSN());
data.put(InternetArticle.PUBLICATION_DATE,
article.getPublicationDate());
data.put(InternetArticle.LAST_ACCESSED,
article.getLastAccessed());
}
@Override
@ -148,8 +148,8 @@ public class InternetArticlePropertyForm
(Integer) data.get(InternetArticle.NUMBER_OF_PAGES));
article.setEdition((String) data.get(InternetArticle.EDITION));
article.setISSN((String) data.get(InternetArticle.ISSN));
article.setPublicationDate(
(Date) data.get(InternetArticle.PUBLICATION_DATE));
article.setLastAccessed(
(Date) data.get(InternetArticle.LAST_ACCESSED));
article.save();
}

1
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources.properties
View File

@ -301,3 +301,4 @@ publication.ui.internetarticle.organization.remove=Remove
publications.ui.monograph.reviewed=Reviewed
publications.ui.monograph.reviewed.yes=Yes
publications.ui.monograph.reviewed.no=No
publications.ui.internetarticle.lastAccessed=

1
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources_de.properties
View File

@ -300,3 +300,4 @@ publication.ui.internetarticle.organization.remove=Entfernen
publications.ui.monograph.reviewed=Begutachtet
publications.ui.monograph.reviewed.yes=Ja
publications.ui.monograph.reviewed.no=Nein
publications.ui.internetarticle.lastAccessed=Letztes Zugriffsdatum

12
ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentPublicationsStep.java
View File

@ -30,12 +30,16 @@ import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
*/
public class SciDepartmentPublicationsStep extends RelatedLinkPropertiesStep {
protected static String s_linkListName = "SciDepartmentPublications";
protected static ContentType s_contentType = ContentType.findByAssociatedObjectType(
"com.arsdigita.cms.contenttypes.Publication");
public SciDepartmentPublicationsStep(ItemSelectionModel itemModel,
AuthoringKitWizard parent) {
super(itemModel, parent);
}
@Override
protected void setLinkSelectionModel() {
super.setLinkSelectionModel();
linkListName = "SciDepartmentPublications";
contentType = ContentType.findByAssociatedObjectType(
"com.arsdigita.cms.contenttypes.Publication");
}
}

14
ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectPublicationsStep.java
View File

@ -29,13 +29,17 @@ import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
* @author jensp
*/
public class SciProjectPublicationsStep extends RelatedLinkPropertiesStep {
protected static String s_linkListName = "SciProjectPublications";
protected static ContentType s_contentType = ContentType.findByAssociatedObjectType(
"com.arsdigita.cms.contenttypes.Publication");
public SciProjectPublicationsStep(ItemSelectionModel itemModel,
AuthoringKitWizard parent) {
super(itemModel, parent);
}
@Override
protected void setLinkSelectionModel() {
super.setLinkSelectionModel();
linkListName = "SciProjectPublications";
contentType = ContentType.findByAssociatedObjectType(
"com.arsdigita.cms.contenttypes.Publication");
}
}