addded license info icon, improved suggestions on error form
git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/widgets/ckan-metadata-publisher-widget@130402 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
d0623da531
commit
624199e9aa
|
@ -130,6 +130,9 @@ public class CreateDatasetForm extends Composite{
|
||||||
@UiField Icon infoIconTags;
|
@UiField Icon infoIconTags;
|
||||||
@UiField FocusPanel focusPanelTags;
|
@UiField FocusPanel focusPanelTags;
|
||||||
@UiField Popover popoverTags;
|
@UiField Popover popoverTags;
|
||||||
|
@UiField Icon infoIconLicenses;
|
||||||
|
@UiField FocusPanel focusPanelLicenses;
|
||||||
|
@UiField Popover popoverLicenses;
|
||||||
@UiField Icon infoIconVisibility;
|
@UiField Icon infoIconVisibility;
|
||||||
@UiField FocusPanel focusPanelVisibility;
|
@UiField FocusPanel focusPanelVisibility;
|
||||||
@UiField Popover popoverVisibility;
|
@UiField Popover popoverVisibility;
|
||||||
|
@ -808,6 +811,16 @@ public class CreateDatasetForm extends Composite{
|
||||||
popoverTags,
|
popoverTags,
|
||||||
focusPanelTags
|
focusPanelTags
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// licenses
|
||||||
|
preparePopupPanelAndPopover(
|
||||||
|
InfoIconsLabels.LICENSES_INFO_ID_POPUP,
|
||||||
|
InfoIconsLabels.LICENSES_INFO_TEXT,
|
||||||
|
InfoIconsLabels.LICENSES_INFO_CAPTION,
|
||||||
|
infoIconLicenses,
|
||||||
|
popoverLicenses,
|
||||||
|
focusPanelLicenses
|
||||||
|
);
|
||||||
|
|
||||||
// visibility
|
// visibility
|
||||||
preparePopupPanelAndPopover(
|
preparePopupPanelAndPopover(
|
||||||
|
@ -899,8 +912,10 @@ public class CreateDatasetForm extends Composite{
|
||||||
|
|
||||||
for (MetaDataFieldSkeleton field : listOfMetadataFields) {
|
for (MetaDataFieldSkeleton field : listOfMetadataFields) {
|
||||||
|
|
||||||
if(!field.isFieldValueValid())
|
String error = field.isFieldValueValid();
|
||||||
return field.getFieldName() + " is not valid";
|
if(error != null){
|
||||||
|
return field.getFieldName() + " is not valid. Suggestion: " + error;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
|
@ -957,7 +972,7 @@ public class CreateDatasetForm extends Composite{
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
t.schedule(4000);
|
t.schedule(10000);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -109,6 +109,14 @@
|
||||||
<b:ListBox b:id="licenses" title="Product license"
|
<b:ListBox b:id="licenses" title="Product license"
|
||||||
width="91%" ui:field="licenseListbox">
|
width="91%" ui:field="licenseListbox">
|
||||||
</b:ListBox>
|
</b:ListBox>
|
||||||
|
<span style="float:right; width:5%; color: #aaaaaa;">
|
||||||
|
<b:Popover ui:field="popoverLicenses" html="true"
|
||||||
|
animation="true" placement="LEFT">
|
||||||
|
<g:FocusPanel ui:field="focusPanelLicenses">
|
||||||
|
<b:Icon type="INFO_SIGN" size="TWO_TIMES" ui:field="infoIconLicenses" />
|
||||||
|
</g:FocusPanel>
|
||||||
|
</b:Popover>
|
||||||
|
</span>
|
||||||
</b:Controls>
|
</b:Controls>
|
||||||
</b:ControlGroup>
|
</b:ControlGroup>
|
||||||
|
|
||||||
|
|
|
@ -213,32 +213,29 @@ public class MetaDataFieldSkeleton extends Composite{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if this field has a valid values
|
* Check if this field has a valid values
|
||||||
* @return
|
* @return a string with the occurred error on error, null otherwise
|
||||||
*/
|
*/
|
||||||
public boolean isFieldValueValid(){
|
public String isFieldValueValid(){
|
||||||
|
|
||||||
GWT.log("Validator is " + field.getValidator());
|
|
||||||
GWT.log("Is mandatory? " + field.getMandatory());
|
|
||||||
|
|
||||||
if(field.getMandatory()){
|
if(field.getMandatory()){
|
||||||
if(holder.getClass().equals(TextBox.class)){
|
if(holder.getClass().equals(TextBox.class)){
|
||||||
|
|
||||||
if(!getFieldCurrentValue().isEmpty())
|
if(!getFieldCurrentValue().isEmpty())
|
||||||
if(field.getValidator() == null || field.getValidator().isEmpty())
|
if(field.getValidator() == null || field.getValidator().isEmpty())
|
||||||
return true;
|
return null;
|
||||||
else return checkValidator(holder, field);
|
else return checkValidator(holder, field) ? null : " the inserted value has a wrong format";
|
||||||
else
|
else
|
||||||
return false;
|
return " a mandatory attribute cannot be empty";
|
||||||
|
|
||||||
}else
|
}else
|
||||||
return true;
|
return null;
|
||||||
|
|
||||||
}else{
|
}else{
|
||||||
|
|
||||||
if(holder.getClass().equals(TextBox.class) && getFieldCurrentValue().isEmpty())
|
if(holder.getClass().equals(TextBox.class) && getFieldCurrentValue().isEmpty())
|
||||||
return true;
|
return null;
|
||||||
|
|
||||||
return checkValidator(holder, field);
|
return checkValidator(holder, field) ? null : " please select a different value for this field";
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,6 +13,11 @@ public class InfoIconsLabels {
|
||||||
+ "product and by means of them it can be retrieved. A tag can contain only alphanumeric characters. "
|
+ "product and by means of them it can be retrieved. A tag can contain only alphanumeric characters. "
|
||||||
+ "If the tag is composed by a single word it must have a size of at least two characters."
|
+ "If the tag is composed by a single word it must have a size of at least two characters."
|
||||||
+ "Examples of good tags: \"This is a sample tag\", \"tagY\". Example of bad tag: \"c\".";
|
+ "Examples of good tags: \"This is a sample tag\", \"tagY\". Example of bad tag: \"c\".";
|
||||||
|
|
||||||
|
// LICENSES
|
||||||
|
public static final String LICENSES_INFO_ID_POPUP = "licenses-popup-panel-info";
|
||||||
|
public static final String LICENSES_INFO_CAPTION = "Licenses";
|
||||||
|
public static final String LICENSES_INFO_TEXT = "License definitions and additional information can be found at <a href=\"http://opendefinition.org/licenses/\" target=\"_blank\">opendefinition.org</a>";
|
||||||
|
|
||||||
// VISIBILITY
|
// VISIBILITY
|
||||||
public static final String VISIBILITY_INFO_ID_POPUP = "visibility-popup-panel-info";
|
public static final String VISIBILITY_INFO_ID_POPUP = "visibility-popup-panel-info";
|
||||||
|
|
Loading…
Reference in New Issue