URL widget type

#452
metasfresh · Jun 12, 2017 · 787c9ef · 787c9ef
1 parent 62ace33
commit 787c9ef
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/main/java/de/metas/ui/web/window/datatypes/json/JSONLayoutWidgetType.java b/src/main/java/de/metas/ui/web/window/datatypes/json/JSONLayoutWidgetType.java
@@ -32,7 +32,7 @@
 @ApiModel("widget-type")
 public enum JSONLayoutWidgetType
 {
-	Text, LongText, Password
+	Text, LongText, Link, Password
 
 	, Date, Time, DateTime
 
@@ -66,6 +66,7 @@ public static JSONLayoutWidgetType fromNullable(DocumentFieldWidgetType widgetTy
 	private static final Map<DocumentFieldWidgetType, JSONLayoutWidgetType> widgetType2json = ImmutableMap.<DocumentFieldWidgetType, JSONLayoutWidgetType> builder()
 			.put(DocumentFieldWidgetType.Text, JSONLayoutWidgetType.Text)
 			.put(DocumentFieldWidgetType.LongText, JSONLayoutWidgetType.LongText)
+			.put(DocumentFieldWidgetType.URL, JSONLayoutWidgetType.Link)
 			.put(DocumentFieldWidgetType.Password, JSONLayoutWidgetType.Password)
 			.put(DocumentFieldWidgetType.Date, JSONLayoutWidgetType.Date)
 			.put(DocumentFieldWidgetType.Time, JSONLayoutWidgetType.Time)

diff --git a/src/main/java/de/metas/ui/web/window/descriptor/DocumentFieldWidgetType.java b/src/main/java/de/metas/ui/web/window/descriptor/DocumentFieldWidgetType.java
@@ -36,6 +36,7 @@ public enum DocumentFieldWidgetType
 	// Text
 	Text(LayoutAlign.Left, String.class) //
 	, LongText(LayoutAlign.Left, String.class) //
+	, URL(LayoutAlign.Left, String.class) //
 	, Password(LayoutAlign.Left, String.class) //
 
 	//
@@ -128,7 +129,7 @@ public final boolean isNumeric()
 
 	public final boolean isText()
 	{
-		return this == Text || this == LongText || this == Password;
+		return this == Text || this == LongText || this == URL || this == Password;
 	}
 
 	public final boolean isButton()

diff --git a/...ain/java/de/metas/ui/web/window/descriptor/factory/standard/DescriptorsFactoryHelper.java b/...ain/java/de/metas/ui/web/window/descriptor/factory/standard/DescriptorsFactoryHelper.java
@@ -163,6 +163,10 @@ else if (isPassword(columnName, displayType))
 		{
 			return DocumentFieldWidgetType.Password;
 		}
+		else if(displayType == DisplayType.URL)
+		{
+			return DocumentFieldWidgetType.URL;
+		}
 		else if (DisplayType.isText(displayType))
 		{
 			return DocumentFieldWidgetType.Text;