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

[UPDATE] 

- solves some Exceptions for the export routine

git-svn-id: https://svn.libreccm.org/ccm/trunk@4402 8810af33-2d31-482b-a856-94f89814c4df
master
tosmers 2016-10-24 17:10:30 +00:00
parent 31945a9dab
commit 8c3ecb49e1
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ccm-core/src/com/arsdigita/categorization/Category.java
View File

@ -608,7 +608,6 @@ public class Category extends ACSObject {
* @return the category description. * @return the category description.
*/ */
public String getDescription(String locale) { public String getDescription(String locale) {
// Test for localized version // Test for localized version
// HACK // HACK
if (locale != null && !locale.isEmpty() && m_categoryLocalizationCollection != null if (locale != null && !locale.isEmpty() && m_categoryLocalizationCollection != null

25
ccm-core/src/com/arsdigita/workflow/simple/Task.java
View File

@ -325,18 +325,19 @@ public class Task extends AuditedACSObject implements Cloneable {
**/ **/
public Workflow getWorkflow() { public Workflow getWorkflow() {
BigDecimal workflowID = getParentID(); BigDecimal workflowID = getParentID();
if (workflowID != null) { // if (workflowID != null) {
try { // try {
return (Workflow) DomainObjectFactory. // return (Workflow) DomainObjectFactory.newInstance(new OID
newInstance(new OID(Workflow.BASE_DATA_OBJECT_TYPE, // (Workflow.BASE_DATA_OBJECT_TYPE, workflowID));
workflowID)); // } catch (DataObjectNotFoundException de) {
} catch (DataObjectNotFoundException de) { // throw new UncheckedWrapperException("Could not load Workflow with ID " +
throw new UncheckedWrapperException("Could not load Workflow with ID " + // workflowID, de);
workflowID, de); // }
} // } else {
} else { // return null;
return null; // }
}
return Workflow.getObjectWorkflow(workflowID);
} }