From cb029538474f5613b23f373dd7e50ee53d675ec1 Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Wed, 16 Nov 2016 09:25:35 +0000 Subject: [PATCH] minor fixes git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/widgets/ckan-metadata-publisher-widget@134215 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/CKanMetadataPublisher.java | 2 +- .../ui/TwinColumnSelection/ResourceInfoForm.java | 3 ++- .../ui/TwinColumnSelection/ResourceInfoForm.ui.xml | 14 ++++++++++---- .../server/CKANPublisherServicesImpl.java | 4 ++-- .../ckandatapublisherwidget/client/TestClass.java | 2 +- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/CKanMetadataPublisher.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/CKanMetadataPublisher.java index cc76dd7..ed59355 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/CKanMetadataPublisher.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/CKanMetadataPublisher.java @@ -37,7 +37,7 @@ public class CKanMetadataPublisher implements EntryPoint { public void onModuleLoad() { // remove comment to the below line for testing the widget - // startExample(); + //startExample(); //testMetadata(); //testSelectionPanel(); diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/TwinColumnSelection/ResourceInfoForm.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/TwinColumnSelection/ResourceInfoForm.java index 595a1e0..f2205c7 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/TwinColumnSelection/ResourceInfoForm.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/TwinColumnSelection/ResourceInfoForm.java @@ -11,6 +11,7 @@ import com.github.gwtbootstrap.client.ui.constants.IconType; import com.google.gwt.cell.client.ValueUpdater; import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.Style.Float; +import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.uibinder.client.UiBinder; @@ -67,7 +68,7 @@ public class ResourceInfoForm extends Composite{ closeButton.getElement().getStyle().setFloat(Float.RIGHT); closeButton.setIcon(IconType.REMOVE_CIRCLE); commandPanel.setCellHorizontalAlignment(updateResourceButton, HasHorizontalAlignment.ALIGN_RIGHT); - + commandPanel.getElement().getStyle().setMarginTop(10, Unit.PX); updateResourceButton.addClickHandler(new ClickHandler() { @Override diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/TwinColumnSelection/ResourceInfoForm.ui.xml b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/TwinColumnSelection/ResourceInfoForm.ui.xml index bcd86cd..c9d29ce 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/TwinColumnSelection/ResourceInfoForm.ui.xml +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/TwinColumnSelection/ResourceInfoForm.ui.xml @@ -13,6 +13,8 @@ padding: 5px; border: 1px solid #bbb; border-radius: 5px; + height: 400px; + width: 95%; } .labels-style { @@ -22,6 +24,10 @@ .controls-style { margin-left: 10px !important; } + + .control-group { + margin-bottom: 0px !important; + } @@ -30,7 +36,7 @@ Resource Information - + Name: @@ -41,7 +47,7 @@ ui:field="resourceName" /> - + Path: @@ -51,7 +57,7 @@ readOnly="true" title="Resource path" ui:field="resourcePath" /> - + Description: @@ -62,7 +68,7 @@ ui:field="resourceDescription"> - + Format: diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java index a5fa036..84d3406 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java @@ -623,14 +623,14 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C String scope = (String)httpSession.getAttribute(SessionCatalogueAttributes.SCOPE_CLIENT_PORTLET_URL); DataCatalogue catalogue = getCatalogue(scope); List ckanGroups = catalogue.getGroups(); - + // TODO check role for (CkanGroup ckanGroup : ckanGroups) { toReturn.add(new GroupBean(ckanGroup.getTitle(), ckanGroup.getName())); } logger.debug("List of groups to return is " + toReturn); - + }else{ logger.warn("Dev mode detected"); toReturn = Arrays.asList(new GroupBean("Group title", "aaa")); diff --git a/src/test/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/TestClass.java b/src/test/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/TestClass.java index b13deca..86b4b81 100644 --- a/src/test/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/TestClass.java +++ b/src/test/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/TestClass.java @@ -11,7 +11,7 @@ public class TestClass { @Test public void testUser() { - // assert(new CKANPublisherServicesImpl().getDevelopmentUser().equals(CKANPublisherServicesImpl.TEST_USER)); + assert(new CKANPublisherServicesImpl().getDevelopmentUser().equals(CKANPublisherServicesImpl.TEST_USER)); } }