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

BugFixes 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1598 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2012-04-17 13:43:47 +00:00
parent 418b4ddeb2
commit 2d213159b5
3 changed files with 24 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ccm-core/src/com/arsdigita/loader/CoreLoader.java
View File

@ -21,8 +21,9 @@ package com.arsdigita.loader;
import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.globalization.Charset;
import com.arsdigita.globalization.Locale;
import com.arsdigita.kernel.Group;
import com.arsdigita.kernel.EmailAddress;
import com.arsdigita.kernel.Group;
import com.arsdigita.kernel.GroupCollection;
import com.arsdigita.kernel.Kernel;
import com.arsdigita.kernel.KernelExcursion;
import com.arsdigita.kernel.PackageInstance;
@ -51,32 +52,27 @@ import com.arsdigita.util.UncheckedWrapperException;
import com.arsdigita.util.parameter.CSVParameterReader;
import com.arsdigita.util.parameter.EmailParameter;
import com.arsdigita.util.parameter.Parameter;
import com.arsdigita.util.parameter.StringParameter;
import com.arsdigita.util.parameter.StringArrayParameter;
import com.arsdigita.util.parameter.StringParameter;
import com.arsdigita.util.servlet.HttpHost;
import com.arsdigita.web.Application;
import com.arsdigita.web.ApplicationType;
import com.arsdigita.web.Host;
import com.arsdigita.web.Web;
import com.arsdigita.webdevsupport.WebDevSupport;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
// import java.util.Locale;
import java.util.Map;
import javax.mail.internet.InternetAddress;
import org.apache.log4j.Logger;

2
ccm-sci-personalprojects/src/com/arsdigita/cms/publicpersonalprofile/PersonalProjects.java
View File

@ -65,8 +65,6 @@ public class PersonalProjects implements ContentGenerator {
if ((projects == null) || projects.isEmpty()) {
personalProjectsElem.newChildElement("noProjects");
return;
} else {
final List<SciProject> currentProjects = new ArrayList<SciProject>();
final List<SciProject> finishedProjects =

52
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/UnPublished.java
View File

@ -74,46 +74,27 @@ public abstract class UnPublished extends Publication {
}
public GenericOrganizationalUnit getOrganization() {
/* DataCollection collection;
final GenericOrganizationalUnitBundle bundle = getUnPublishedBundle().
getOrganization();
collection = (DataCollection) get(ORGANIZATION);
if (0 == collection.size()) {
return null;
} else {
DataObject dobj;
collection.next();
dobj = collection.getDataObject();
collection.close();
return (GenericOrganizationalUnit) DomainObjectFactory.newInstance(
dobj);
}*/
return (GenericOrganizationalUnit) getUnPublishedBundle().
getOrganization().getPrimaryInstance();
if (bundle == null) {
return null;
} else {
return (GenericOrganizationalUnit) bundle.getPrimaryInstance();
}
}
public GenericOrganizationalUnit getOrganization(final String language) {
return (GenericOrganizationalUnit) getUnPublishedBundle().
getOrganization().getInstance(language);
final GenericOrganizationalUnitBundle bundle = getUnPublishedBundle().
getOrganization();
if (bundle == null) {
return null;
} else {
return (GenericOrganizationalUnit) bundle.getInstance(language);
}
}
public void setOrganization(final GenericOrganizationalUnit orga) {
/*GenericOrganizationalUnit oldOrga;
oldOrga = getOrganization();
if (oldOrga != null) {
remove(ORGANIZATION, oldOrga);
}
if (null != orga) {
Assert.exists(orga, GenericOrganizationalUnit.class);
DataObject link = add(ORGANIZATION, orga);
link.set("orgaOrder", 1);
link.save();
}*/
getUnPublishedBundle().setOrganization(orga);
}
@ -140,9 +121,10 @@ public abstract class UnPublished extends Publication {
return generators;
}
@Override
@Override
public List<ExtraXMLGenerator> getExtraListXMLGenerators() {
final List<ExtraXMLGenerator> generators = super.getExtraListXMLGenerators();
final List<ExtraXMLGenerator> generators = super.
getExtraListXMLGenerators();
generators.add(new UnPublishedExtraXmlGenerator());
return generators;
}