Permalink
Browse files

BZ:1277466 - No tasks shown in task list

  • Loading branch information...
nmirasch authored and csadilek committed Nov 6, 2015
1 parent c3e3dfa commit b9ee18604c21730050ad4af3048b00cc996c0c2c
@@ -535,24 +535,21 @@ private JSONValue formatValue(Object value) {
// Null
return JSONNull.getInstance();
}
try {
// Boolean
return JSONBoolean.getInstance((Boolean) value);
}
catch (Exception e1) {
// Boolean
if(value instanceof Boolean ){
return JSONBoolean.getInstance((Boolean) value);
} else if(value instanceof Number) {
return new JSONNumber(((Number) value).doubleValue());
} else if (value instanceof Date){
try {
// Number
return new JSONNumber(((Number) value).doubleValue());
} catch (Exception e2) {
try {
// Date
return new JSONString(_dateFormat.format((Date) value));
} catch (Exception e3) {
// String
// Date
return new JSONString(_dateFormat.format((Date) value));
} catch (Exception e) {
return new JSONString(value.toString());
}
}
}
return new JSONString(value.toString());
}
private Comparable parseValue(JSONValue jsonValue) {
@@ -46,22 +46,9 @@
@RunWith(GwtMockitoTestRunner.class)
public class DataSetLookupJSONMarshallerTest {
public static final String COLUMN_ACTIVATIONTIME = "activationTime";
public static final String COLUMN_ACTUALOWNER = "actualOwner";
public static final String COLUMN_CREATEDBY = "createdBy";
public static final String COLUMN_CREATEDON = "createdOn";
public static final String COLUMN_DEPLOYMENTID = "deploymentId";
public static final String COLUMN_DESCRIPTION = "description";
public static final String COLUMN_DUEDATE = "dueDate";
public static final String COLUMN_NAME = "name";
public static final String COLUMN_PARENTID = "parentId";
public static final String COLUMN_PRIORITY = "priority";
public static final String COLUMN_PROCESSID = "processId";
public static final String COLUMN_PROCESSINSTANCEID = "processInstanceId";
public static final String COLUMN_PROCESSSESSIONID = "processSessionId";
public static final String COLUMN_STATUS = "status";
public static final String COLUMN_TASKID = "taskId";
public static final String COLUMN_WORKITEMID = "workItemId";
public static final String COLUMN_ENABLED = "enabled";
public static final String COLUMN_ORGANIZATIONAL_ENTITY = "oeid";
@Mock
@@ -87,6 +74,7 @@ public void setUp() throws Exception {
List<ColumnFilter> condList = new ArrayList<ColumnFilter>();
condList.add( FilterFactory.equalsTo(COLUMN_ORGANIZATIONAL_ENTITY, "val1"));
condList.add(FilterFactory.equalsTo(COLUMN_ACTUALOWNER, "val2"));
condList.add(FilterFactory.equalsTo(COLUMN_ENABLED, Boolean.TRUE));
condList.add(FilterFactory.AND(COLUMN_NAME, FilterFactory.equalsTo("1", "2")));
datasetFilter.addFilterColumn(FilterFactory.AND(condList));

0 comments on commit b9ee186

Please sign in to comment.