Added changes reported at #19544

task/19600
Francesco Mangiacrapa 4 years ago
parent 2ff3ba214b
commit c02abf7d6b

@ -54,7 +54,7 @@ public class AccoutingInfoContainer extends LayoutContainer {
*/
private static final String TYPEOPERATION = "typeoperation";
protected static final String DATE = "Date";
protected static final String AUTHOR = "Author";
protected static final String USER = "User";
protected static final String OPERATION = "Operation";
protected static final String DESCRIPTION = "Description";
private ColumnModel cm;
@ -202,7 +202,7 @@ public class AccoutingInfoContainer extends LayoutContainer {
ColumnConfig oper = createSortableColumnConfig(OPERATION_NAME, OPERATION, 70);
columns.add(oper);
ColumnConfig auth = createSortableColumnConfig(AUTHOR, AUTHOR, 120);
ColumnConfig auth = createSortableColumnConfig(USER, USER, 120);
columns.add(auth);
ColumnConfig date = createSortableColumnConfig(DATE, DATE, 140);
@ -236,7 +236,7 @@ public class AccoutingInfoContainer extends LayoutContainer {
StringFilter descrFilter = new StringFilter(DESCRIPTION);
filters.addFilter(descrFilter);
StringFilter authorFilter = new StringFilter(AUTHOR);
StringFilter authorFilter = new StringFilter(USER);
filters.addFilter(authorFilter);
ListFilter listFilter = new ListFilter(OPERATION_NAME, typeStoreOperation);
@ -339,7 +339,7 @@ public class AccoutingInfoContainer extends LayoutContainer {
// typeStoreOperation.add(type((gxtAccountingField.getOperation().getId())));
}
baseModel.set(AUTHOR, gxtAccountingField.getUser().getName());
baseModel.set(USER, gxtAccountingField.getUser().getName());
baseModel.set(DATE, gxtAccountingField.getDate());
listModelData.add(baseModel);

@ -480,12 +480,11 @@ public class StorageHubToWorkpaceConverter implements Serializable{
String theUser = shubAccEntry.getUser();
InfoContactModel user = null;
//Ignoring get user details from Liferay in case of user equal to 'ALL'
if(theUser!=null && !theUser.equalsIgnoreCase("ALL")){
user = buildGxtInfoContactFromPortalLogin(shubAccEntry.getUser());
}else {
//CASE ALL
user = new InfoContactModel(theUser, "", "", null, false);
}
af.setUser(user);
af.setDate(FormatterUtil.toDate(shubAccEntry.getDate()));
@ -687,10 +686,15 @@ public class StorageHubToWorkpaceConverter implements Serializable{
AccountEntryUnshare uns = (AccountEntryUnshare) shubAccEntry;
String msg = "Folder ";
msg+= uns.getItemName()==null || uns.getItemName().isEmpty()?"":uns.getItemName()+" ";
//see Task #19544
if(shubAccEntry.getUser().equalsIgnoreCase("ALL")) {
//CASE ALL
msg+= "is no longer shared";
}else
user = new InfoContactModel(theUser, "n.a.", "n.a.", null, false);
}else {
msg+= "is no longer shared with "+user.getName();
user = new InfoContactModel(theUser, "Owner / Admin", "Owner / Admin", null, false);
}
af.setDescription(msg);
}

Loading…
Cancel
Save