gCubeSystem
/
ckan-metadata-publisher-widget
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixing Bug #12914 The form to add/choice the resources to publishing remains frozen 

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/widgets/ckan-metadata-publisher-widget@174234 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2018-11-20 11:29:41 +00:00
parent ea24c207dc
commit b3e9a91388
5 changed files with 63 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
distro/changelog.xml
View File

@ -1,4 +1,9 @@
<ReleaseNotes> <ReleaseNotes>
<Changeset
component="org.gcube.portlets-widgets.ckan-metadata-publisher-widget.1-4-1"
date="2018-11-20">
<Change>[Bug #12914] The form to add/choice the resources to publishing remains frozen</Change>
</Changeset>
<Changeset <Changeset
component="org.gcube.portlets-widgets.ckan-metadata-publisher-widget.1-4-0" component="org.gcube.portlets-widgets.ckan-metadata-publisher-widget.1-4-0"
date="2018-09-28"> date="2018-09-28">

2
pom.xml
View File

@ -12,7 +12,7 @@
<groupId>org.gcube.portlets.widgets</groupId> <groupId>org.gcube.portlets.widgets</groupId>
<artifactId>ckan-metadata-publisher-widget</artifactId> <artifactId>ckan-metadata-publisher-widget</artifactId>
<version>1.4.0-SNAPSHOT</version> <version>1.4.1-SNAPSHOT</version>
<name>gCube Ckan metadata publisher widget</name> <name>gCube Ckan metadata publisher widget</name>
<description> <description>

2
src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/TwinColumnSelection/ResourceCellRight.java
View File

@ -53,7 +53,7 @@ public class ResourceCellRight extends AbstractCell<ResourceElementBean>{
public void onBrowserEvent(com.google.gwt.cell.client.Cell.Context context, public void onBrowserEvent(com.google.gwt.cell.client.Cell.Context context,
Element parent, ResourceElementBean value, NativeEvent event, Element parent, ResourceElementBean value, NativeEvent event,
ValueUpdater<ResourceElementBean> valueUpdater) { ValueUpdater<ResourceElementBean> valueUpdater) {
if(value == null || TwinColumnSelectionMainPanel.freezed) if(value == null || TwinColumnSelectionMainPanel.isFroozen())
return; return;
super.onBrowserEvent(context, parent, value, event, valueUpdater); super.onBrowserEvent(context, parent, value, event, valueUpdater);
ResourceInfoForm info = new ResourceInfoForm(value, valueUpdater); ResourceInfoForm info = new ResourceInfoForm(value, valueUpdater);

27
src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/TwinColumnSelection/TwinColumnSelectionMainPanel.java
View File

@ -35,6 +35,7 @@ import com.google.gwt.view.client.SelectionChangeEvent;
/** /**
* The twin column panels for selection of the files to attach to the catalague product. * The twin column panels for selection of the files to attach to the catalague product.
* @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it) * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
* @author Francesco Mangiacrapa at ISTI-CNR
*/ */
public class TwinColumnSelectionMainPanel extends Composite{ public class TwinColumnSelectionMainPanel extends Composite{
@ -79,7 +80,7 @@ public class TwinColumnSelectionMainPanel extends Composite{
} }
} }
public static boolean freezed = false; private static boolean frozen = false;
private List<PathBean> pathListBeans = new ArrayList<PathBean>(); private List<PathBean> pathListBeans = new ArrayList<PathBean>();
private static final String PANEL_BORDER_COLOR = "#8899a6"; private static final String PANEL_BORDER_COLOR = "#8899a6";
private static final String PANEL_HEIGHT = "400px"; private static final String PANEL_HEIGHT = "400px";
@ -107,6 +108,7 @@ public class TwinColumnSelectionMainPanel extends Composite{
public TwinColumnSelectionMainPanel(ResourceElementBean initialBean) { public TwinColumnSelectionMainPanel(ResourceElementBean initialBean) {
initWidget(uiBinder.createAndBindUi(this)); initWidget(uiBinder.createAndBindUi(this));
frozen = false;
GWT.log(initialBean.toString()); GWT.log(initialBean.toString());
@ -163,13 +165,13 @@ public class TwinColumnSelectionMainPanel extends Composite{
public void onSelectionChange(SelectionChangeEvent event) { public void onSelectionChange(SelectionChangeEvent event) {
if(freezed) if(frozen)
return; return;
Iterator<ResourceElementBean> selectedObjectsIterator = selectionModelLeft.getSelectedSet().iterator(); Iterator<ResourceElementBean> selectedObjectsIterator = selectionModelLeft.getSelectedSet().iterator();
while (selectedObjectsIterator.hasNext()) { while (selectedObjectsIterator.hasNext()) {
ResourceElementBean selectedBean = (ResourceElementBean) selectedObjectsIterator.next(); ResourceElementBean selectedBean = selectedObjectsIterator.next();
if(selectedBean.isFolder()){ if(selectedBean.isFolder()){
// a single folder selected // a single folder selected
@ -325,7 +327,7 @@ public class TwinColumnSelectionMainPanel extends Composite{
selectionModelRight.addSelectionChangeHandler(new SelectionChangeEvent.Handler() { selectionModelRight.addSelectionChangeHandler(new SelectionChangeEvent.Handler() {
public void onSelectionChange(SelectionChangeEvent event) { public void onSelectionChange(SelectionChangeEvent event) {
if(freezed) if(frozen)
return; return;
enableMoveToLeftButtons(selectionModelRight.getSelectedSet()); enableMoveToLeftButtons(selectionModelRight.getSelectedSet());
@ -432,7 +434,7 @@ public class TwinColumnSelectionMainPanel extends Composite{
Iterator<ResourceElementBean> iterator = setSelected.iterator(); Iterator<ResourceElementBean> iterator = setSelected.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
ResourceElementBean resourceElementBean = (ResourceElementBean) iterator ResourceElementBean resourceElementBean = iterator
.next(); .next();
resourceElementBean.setToBeAdded(true); resourceElementBean.setToBeAdded(true);
@ -461,7 +463,7 @@ public class TwinColumnSelectionMainPanel extends Composite{
Iterator<ResourceElementBean> iterator = setSelected.iterator(); Iterator<ResourceElementBean> iterator = setSelected.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
ResourceElementBean resourceElementBean = (ResourceElementBean) iterator.next(); ResourceElementBean resourceElementBean = iterator.next();
resourceElementBean.setToBeAdded(false); resourceElementBean.setToBeAdded(false);
} }
@ -475,11 +477,11 @@ public class TwinColumnSelectionMainPanel extends Composite{
*/ */
public void freeze() { public void freeze() {
freezed = true; frozen = true;
Iterator<Widget> iteratorOverPath = breadcrumbs.iterator(); Iterator<Widget> iteratorOverPath = breadcrumbs.iterator();
while (iteratorOverPath.hasNext()) { while (iteratorOverPath.hasNext()) {
Widget widget = (Widget) iteratorOverPath.next(); Widget widget = iteratorOverPath.next();
if(widget instanceof NavLink) if(widget instanceof NavLink)
((NavLink)widget).setActive(false); ((NavLink)widget).setActive(false);
} }
@ -513,6 +515,15 @@ public class TwinColumnSelectionMainPanel extends Composite{
return toReturn; return toReturn;
} }
/**
* @return the freezed
*/
public static boolean isFroozen() {
return frozen;
}
// @UiHandler("getResources") // @UiHandler("getResources")
// void getResources(ClickEvent ce){ // void getResources(ClickEvent ce){
// getResourcesToPublish(); // getResourcesToPublish();

12
src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/CreateDatasetForm.java
View File

@ -335,7 +335,7 @@ public class CreateDatasetForm extends Composite{
Iterator<Entry<String, List<String>>> iteratorOverCustomField = customFieldsMap.entrySet().iterator(); Iterator<Entry<String, List<String>>> iteratorOverCustomField = customFieldsMap.entrySet().iterator();
while (iteratorOverCustomField.hasNext()) { while (iteratorOverCustomField.hasNext()) {
Map.Entry<java.lang.String, java.util.List<java.lang.String>> entry = (Map.Entry<java.lang.String, java.util.List<java.lang.String>>) iteratorOverCustomField Map.Entry<java.lang.String, java.util.List<java.lang.String>> entry = iteratorOverCustomField
.next(); .next();
List<String> values = entry.getValue(); List<String> values = entry.getValue();
@ -1020,8 +1020,8 @@ public class CreateDatasetForm extends Composite{
goToDatasetButtonPanel.setVisible(true); goToDatasetButtonPanel.setVisible(true);
goToDatasetButton.setVisible(true); goToDatasetButton.setVisible(true);
goToDatasetButton.setText( goToDatasetButton.setText(
(datasetUrl.length() > 100 ? datasetUrl.length() > 100 ?
datasetUrl.substring(0, 100) + "..." : datasetUrl) datasetUrl.substring(0, 100) + "..." : datasetUrl
); );
// goToDatasetButton.setHref(datasetUrl); // goToDatasetButton.setHref(datasetUrl);
goToDatasetButton.addClickHandler(new ClickHandler() { goToDatasetButton.addClickHandler(new ClickHandler() {
@ -1390,7 +1390,7 @@ public class CreateDatasetForm extends Composite{
* @return * @return
*/ */
private boolean checkSelectedMetaDataProfile() { private boolean checkSelectedMetaDataProfile() {
return metadataTypeListbox.getSelectedItemText().equals(NONE_PROFILE) && (metadataTypeListbox.getItemCount() != 1); return metadataTypeListbox.getSelectedItemText().equals(NONE_PROFILE) && metadataTypeListbox.getItemCount() != 1;
} }
@UiHandler("resetButton") @UiHandler("resetButton")
@ -1520,8 +1520,8 @@ public class CreateDatasetForm extends Composite{
*/ */
private boolean hideManageResources(){ private boolean hideManageResources(){
return receivedBean.getResourceRoot() == null || (receivedBean.getResourceRoot().isFolder() && (receivedBean.getResourceRoot().getChildren() == null || return receivedBean.getResourceRoot() == null || receivedBean.getResourceRoot().isFolder() && (receivedBean.getResourceRoot().getChildren() == null ||
receivedBean.getResourceRoot().getChildren().isEmpty())); receivedBean.getResourceRoot().getChildren().isEmpty());
} }
} }