fixed the rfmo listing filter
git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@98145 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
33f033f2db
commit
16bfb69d8e
|
@ -101,8 +101,6 @@ public class RichTextToolbar extends Composite {
|
|||
basic.toggleItalic();
|
||||
} else if (sender == underline) {
|
||||
basic.toggleUnderline();
|
||||
} else if (sender == strikethrough) {
|
||||
extended.toggleStrikethrough();
|
||||
}else if (sender == subscript) {
|
||||
extended.toggleSubscript();
|
||||
} else if (sender == superscript) {
|
||||
|
@ -127,9 +125,9 @@ public class RichTextToolbar extends Composite {
|
|||
} else if (sender == ul) {
|
||||
extended.insertUnorderedList();
|
||||
}
|
||||
else if (sender == foreColorButton) {
|
||||
commands.get("pickColor").execute();
|
||||
}
|
||||
// else if (sender == foreColorButton) {
|
||||
// commands.get("pickColor").execute();
|
||||
// }
|
||||
else if (sender == removeFormat) {
|
||||
extended.removeFormat();
|
||||
} else if (sender == richText) {
|
||||
|
@ -175,7 +173,7 @@ public class RichTextToolbar extends Composite {
|
|||
private ToggleButton bold;
|
||||
private ToggleButton italic;
|
||||
private ToggleButton underline;
|
||||
private ToggleButton strikethrough;
|
||||
// private ToggleButton strikethrough;
|
||||
private ToggleButton superscript;
|
||||
private ToggleButton subscript;
|
||||
private PushButton justifyLeft;
|
||||
|
@ -201,7 +199,7 @@ public class RichTextToolbar extends Composite {
|
|||
private ListBox fonts;
|
||||
private ListBox fontSizes;
|
||||
|
||||
private PushButton foreColorButton;
|
||||
// private PushButton foreColorButton;
|
||||
|
||||
private HashMap<String, Command> commands;
|
||||
|
||||
|
@ -289,8 +287,8 @@ public class RichTextToolbar extends Composite {
|
|||
topPanel.add(subscript = createToggleButton(images.subscript(),"subscript"));
|
||||
topPanel.add(superscript = createToggleButton(images.superscript(),
|
||||
"superscript"));
|
||||
topPanel.add(strikethrough = createToggleButton(images.strikeThrough(),
|
||||
strings.strikeThrough()));
|
||||
// topPanel.add(strikethrough = createToggleButton(images.strikeThrough(),
|
||||
// strings.strikeThrough()));
|
||||
topPanel.add(new HTML(" ", true));
|
||||
topPanel.add(justifyLeft = createPushButton(images.justifyLeft(),
|
||||
strings.justifyLeft()));
|
||||
|
@ -317,8 +315,8 @@ public class RichTextToolbar extends Composite {
|
|||
|
||||
topPanel.add(removeFormat = createPushButton(images.removeFormat(),
|
||||
strings.removeFormat()));
|
||||
topPanel.add(foreColorButton = createPushButton(images.foreColors(),
|
||||
"Text Color"));
|
||||
// topPanel.add(foreColorButton = createPushButton(images.foreColors(),
|
||||
// "Text Color"));
|
||||
}
|
||||
if (basic != null) {
|
||||
topPanel.add(new HTML(" "));
|
||||
|
@ -398,10 +396,6 @@ public class RichTextToolbar extends Composite {
|
|||
italic.setDown(basic.isItalic());
|
||||
underline.setDown(basic.isUnderlined());
|
||||
}
|
||||
|
||||
if (extended != null) {
|
||||
strikethrough.setDown(extended.isStrikethrough());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -412,13 +406,13 @@ public class RichTextToolbar extends Composite {
|
|||
bold.setEnabled(enable);
|
||||
italic.setEnabled(enable);
|
||||
underline.setEnabled(enable);
|
||||
strikethrough.setEnabled(enable);
|
||||
// strikethrough.setEnabled(enable);
|
||||
justifyLeft.setEnabled(enable);
|
||||
justifyCenter.setEnabled(enable);
|
||||
justifyRight.setEnabled(enable);
|
||||
superscript.setEnabled(enable);
|
||||
subscript.setEnabled(enable);
|
||||
foreColorButton.setEnabled(enable);
|
||||
// foreColorButton.setEnabled(enable);
|
||||
// insertImage.setEnabled(enable);
|
||||
ol.setEnabled(enable);
|
||||
ul.setEnabled(enable);
|
||||
|
|
|
@ -1736,17 +1736,6 @@ public class ReportServiceImpl extends RemoteServiceServlet implements ReportSe
|
|||
|
||||
}
|
||||
}
|
||||
|
||||
boolean isManager = isVREManager();
|
||||
ArrayList<String> allowedRFMOs = getUserRFMOs();
|
||||
|
||||
for (ReportEntry re : rsgClient.listReports(type)) {
|
||||
String rfmo = re.getOwner();
|
||||
String name = re.getIdentifier();
|
||||
if (isManager || allowedRFMOs.contains(rfmo))
|
||||
toReturn.add(new VMEReportBean(""+re.getId(), rfmo, name));
|
||||
}
|
||||
|
||||
return toReturn;
|
||||
}
|
||||
|
||||
|
@ -1763,12 +1752,30 @@ public class ReportServiceImpl extends RemoteServiceServlet implements ReportSe
|
|||
type.setTypeIdentifier(refType.toString());
|
||||
RsgClient rsgClient = getRsgSecureClient();
|
||||
|
||||
|
||||
if (isVREManager()) {
|
||||
for (ReportEntry re :rsgClient.listReports(new ReportType(refType.getId()))) {
|
||||
String rfmo = re.getOwner();
|
||||
String name = re.getIdentifier();
|
||||
toReturn.add(new VMEReportBean(""+re.getId(), rfmo, name));
|
||||
}
|
||||
} else {
|
||||
ArrayList<String> allowedRFMOs = getUserRFMOs();
|
||||
for (ReportEntry re :rsgClient.listReports(new ReportType(refType.getId()))) {
|
||||
String rfmo = re.getOwner();
|
||||
String name = re.getIdentifier();
|
||||
if (rfmo == null) { //when getting a RFMO refType the Owner is null
|
||||
rfmo = name;
|
||||
}
|
||||
for (String allowedRFMO : allowedRFMOs) {
|
||||
if (allowedRFMO.compareTo(rfmo) == 0) {
|
||||
toReturn.add(new VMEReportBean(""+re.getId(), rfmo, name));
|
||||
_log.debug("Added ref report " + rfmo + " - " + name);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return toReturn;
|
||||
}
|
||||
|
||||
|
|
Reference in New Issue