diff --git a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/CkanToZendoPublisherWidget.java b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/CkanToZendoPublisherWidget.java index 46746cd..a4b9b72 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/CkanToZendoPublisherWidget.java +++ b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/CkanToZendoPublisherWidget.java @@ -154,7 +154,7 @@ public class CkanToZendoPublisherWidget { if(!isValid) allFormsAreValid = false; } - + if(allFormsAreValid) { buttonPublish.setEnabled(false); basicTabPanel.getElement().getStyle().setOpacity(0.5); diff --git a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/ui/authors/CreatorsFormView.java b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/ui/authors/CreatorsFormView.java index 9a17516..7821871 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/ui/authors/CreatorsFormView.java +++ b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/ui/authors/CreatorsFormView.java @@ -176,7 +176,8 @@ public class CreatorsFormView extends Composite implements FormValidator{ if(userRole.compareToIgnoreCase(ZenodoContributor.USER_ROLE)==0) { author = new ZenodoContributor(); ((ZenodoContributor) author).setType(contributorTypeValues); - } + }else + author = new ZenodoCreator(); CreatorView view = new CreatorView(author, userRole, eventBus,false); listCreatorView.add(view); @@ -206,7 +207,7 @@ public class CreatorsFormView extends Composite implements FormValidator{ */ public List readListOfCreatorsFromView(){ - List listAuthors = new ArrayList<>(listCreatorView.size()); + List listAuthors = new ArrayList<>(); for (CreatorView creatorView : listCreatorView) { ZenodoAuthor author = creatorView.getAuthor(); @@ -227,6 +228,7 @@ public class CreatorsFormView extends Composite implements FormValidator{ GWT.log("The fielName is null or empty skpping he/she from list of Authors"); } + GWT.log("returning list of authors: "+listAuthors); return listAuthors; } diff --git a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/ui/basicinformation/BasicInformationView.java b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/ui/basicinformation/BasicInformationView.java index 69d705a..da36fbb 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/ui/basicinformation/BasicInformationView.java +++ b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/ui/basicinformation/BasicInformationView.java @@ -554,6 +554,9 @@ public class BasicInformationView extends Composite implements FormValidator { */ public List getListOfCreators() { List listOfCreators = new ArrayList<>(); + if(listOfCreatorsView==null) { + return listOfCreators; + } for (CreatorsFormView cfv : listOfCreatorsView) { List listOfUsers = cfv.readListOfCreatorsFromView(); for (ZenodoAuthor zenodoAuthor : listOfUsers) { @@ -570,11 +573,15 @@ public class BasicInformationView extends Composite implements FormValidator { */ public List getListOfContributors() { List listOfContributors = new ArrayList<>(); + if(listOfContributorsView==null) { + return listOfContributors; + } for (CreatorsFormView cfv : listOfContributorsView) { List listOfUsers = cfv.readListOfCreatorsFromView(); for (ZenodoAuthor zenodoAuthor : listOfUsers) { listOfContributors.add((ZenodoContributor) zenodoAuthor); } + } return listOfContributors; }