From 1f3dfc0f505a95c22c424cea458e9e5f709dd2b1 Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Sat, 25 Jan 2020 02:11:26 -0500 Subject: [PATCH] fix tests --- bubble-server/src/main/java/bubble/model/app/AppSite.java | 4 +++- .../models/apps/user_block/hn/bubbleApp_userBlock_hn.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bubble-server/src/main/java/bubble/model/app/AppSite.java b/bubble-server/src/main/java/bubble/model/app/AppSite.java index bd273275..dca83146 100644 --- a/bubble-server/src/main/java/bubble/model/app/AppSite.java +++ b/bubble-server/src/main/java/bubble/model/app/AppSite.java @@ -8,6 +8,7 @@ import lombok.experimental.Accessors; import org.cobbzilla.util.collection.ArrayUtil; import org.cobbzilla.wizard.model.Identifiable; import org.cobbzilla.wizard.model.IdentifiableBase; +import org.cobbzilla.wizard.model.entityconfig.EntityFieldType; import org.cobbzilla.wizard.model.entityconfig.annotations.*; import javax.persistence.Column; @@ -69,7 +70,8 @@ public class AppSite extends IdentifiableBase implements AppTemplateEntity { @Column(nullable=false, length=10000) @Getter @Setter private String description; - @ECSearchable(filter=true) @ECField(index=70) + // use opaque_string instead of default (http_url) because '*' is a valid value + @ECSearchable(filter=true) @ECField(index=70, type=EntityFieldType.opaque_string) @Column(nullable=false, length=1024) @Getter @Setter private String url; diff --git a/bubble-server/src/main/resources/models/apps/user_block/hn/bubbleApp_userBlock_hn.json b/bubble-server/src/main/resources/models/apps/user_block/hn/bubbleApp_userBlock_hn.json index 2894022c..c2cfb683 100644 --- a/bubble-server/src/main/resources/models/apps/user_block/hn/bubbleApp_userBlock_hn.json +++ b/bubble-server/src/main/resources/models/apps/user_block/hn/bubbleApp_userBlock_hn.json @@ -10,7 +10,7 @@ "AppRule": [{ "name": "hn_user_blocker", "template": true, - "driver": "JsUserBlocker", + "driver": "UserBlocker", "config": { "blockedCommentCheck": "parseInt(current.get('width')) > parseInt(blocked.get('width'))", "blockedCommentReplacement": "{{{chunkStartRegex}}}[comment by {{blockedUser}} has been blocked] UNBLOCK",