Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fixing conversion issues

  • Loading branch information...
commit 89f466fcc5508de64aa138c98af74a5e948c462f 1 parent a9e5123
@anti43 authored
Showing with 11 additions and 3 deletions.
  1. +11 −3 src/mpv5/db/common/Context.java
View
14 src/mpv5/db/common/Context.java
@@ -260,6 +260,7 @@ public static String getAliasFor(Context context, Context exct) {
list.add(getProduct());
list.add(getReminder());
list.add(getActivityList());
+ list.add(getConversation());
return list;
}
@@ -292,6 +293,7 @@ public static String getAliasFor(Context context, Context exct) {
list.add(getProductOrderSubitem());
list.add(getProductOrder());
list.add(getProductPrice());
+ list.add(getConversation());
return list;
}
@@ -329,7 +331,8 @@ public static String getAliasFor(Context context, Context exct) {
getProductPrice(),
getActivityListItems(),
getProductOrderSubitem(),
- getProductOrder()
+ getProductOrder(),
+ getConversation()
}));
/**
@@ -366,6 +369,7 @@ public static String getAliasFor(Context context, Context exct) {
list.add(getActivityListItems());
list.add(getProductOrderSubitem());
list.add(getProductOrder());
+ list.add(getConversation());
return list;
}
@@ -392,6 +396,7 @@ public static String getAliasFor(Context context, Context exct) {
list.add(getActivityList());
list.add(getProductOrderSubitem());
list.add(getProductOrder());
+ list.add(getConversation());
return list;
}
@@ -416,6 +421,7 @@ public static String getAliasFor(Context context, Context exct) {
list.add(getProduct());
list.add(getProductOrderSubitem());
list.add(getProductOrder());
+ list.add(getConversation());
//// list.add(getAccounts());
return list;
}
@@ -436,6 +442,7 @@ public static String getAliasFor(Context context, Context exct) {
list.add(getSupplier());
list.add(getManufacturer());
list.add(getWebShop());
+ list.add(getConversation());
return list;
}
@@ -513,7 +520,8 @@ public static String getAliasFor(Context context, Context exct) {
getProductPrice(),
getMassprint(),
getProductOrderSubitem(),
- getProductOrder()
+ getProductOrder(),
+ getConversation()
}));
// private String[] searchHeaders;
private volatile ArrayList<String[]> references = new ArrayList<String[]>();
@@ -831,7 +839,7 @@ public synchronized String getNoTrashSQLString() {
if (getTrashableContexts().contains(this)) {
return " " + dbIdentity + ".invisible = 0 ";
} else {
- return null;
+ return "";
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.