Fixed a condition when the execution description is not exist

Top-Q · Mar 7, 2016 · 2fd5c0f · 2fd5c0f
1 parent 0bc9d20
commit 2fd5c0f
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/difido-server/src/main/java/il/co/topq/report/resource/ReportResource.java b/difido-server/src/main/java/il/co/topq/report/resource/ReportResource.java
@@ -13,6 +13,7 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
+import org.elasticsearch.common.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.RestController;
@@ -66,7 +67,11 @@ public DataTable get(@PathParam("execution") int execution) {
 		for (ExecutionMetaData meta : metaData) {
 			final Map<String, Object> row = new HashMap<String, Object>();
 			row.put(ID, meta.getId());
-			row.put(DESCRIPTION, meta.getDescription());
+			if (!StringUtils.isEmpty(meta.getDescription())){
+				row.put(DESCRIPTION, meta.getDescription());
+			} else {
+				row.put(DESCRIPTION, meta.getFolderName());
+			}
 			row.put(LINK, meta.getUri());
 			row.put(DATE, meta.getDate());
 			row.put(TIME, meta.getTime());