fix bubble block model bugs

bubble-server/src/main/java/bubble/dao/app/AppMatcherDAO.java

@@ -34,6 +34,9 @@ public class AppMatcherDAO extends AppTemplateEntityDAO<AppMatcher> {
             if (rule == null) return die("postUpdate("+ matcher.getUuid()+"): rule not found: "+ matcher.getRule());
 
             for (Account account : accountDAO.findAll()) {
+                if (account.getUuid().equals(matcher.getAccount())) {
+                    continue;
+                }
                 final BubbleApp accountApp = appDAO.findByAccountAndId(account.getUuid(), app.getName());
                 if (accountApp == null) {
                     // todo: log this?

bubble-server/src/main/java/bubble/model/app/AppMatcher.java

@@ -38,8 +38,8 @@ import static org.cobbzilla.wizard.model.crypto.EncryptedTypes.ENC_PAD;
 })
 public class AppMatcher extends IdentifiableBase implements AppTemplateEntity, HasPriority {
 
-    public static final String[] VALUE_FIELDS = {"fqdn", "urlRegex", "rule", "template", "enabled", "priority"};
-    public static final String[] CREATE_FIELDS = ArrayUtil.append(VALUE_FIELDS, "name", "site");
+    public static final String[] VALUE_FIELDS = {"fqdn", "urlRegex", "template", "enabled", "priority"};
+    public static final String[] CREATE_FIELDS = ArrayUtil.append(VALUE_FIELDS, "name", "site", "rule");
 
     public AppMatcher(AppMatcher other) {
         copy(this, other, CREATE_FIELDS);

bubble-server/src/main/java/bubble/model/app/config/AppConfigView.java

@@ -10,7 +10,7 @@ public class AppConfigView {
     @Getter @Setter private String name;
     @Getter @Setter private AppConfigScope scope;
 
-    @Getter @Setter private Boolean root = true;
+    @Getter @Setter private Boolean root = false;
     public boolean root() { return root != null && root; }
 
     @Getter @Setter private String[] columns;

bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties

@@ -382,6 +382,8 @@ message_no_data=No Data
 option_all_devices=All Devices
 button_label_app_data_refresh=Search
 
+table_title_app_config_views=App Configuration
+
 # AppSite
 loading_app_site=Loading site...
 table_title_app_site_view=App Site Views

bubble-server/src/main/resources/models/apps/bubble_block/bubbleApp_bubbleBlock.json

@@ -117,7 +117,7 @@
     "AppMessage": [{
       "locale": "en_US",
       "messages": [
-        {"name": "name", "value": "BubbleBlock"},
+        {"name": "name", "value": "Bubble Filter"},
         {"name": "description", "value": "Network Filter: Blocks adware, malware, phishing/scam sites, and much more"},
         {"name": "field.ctime", "value": "When"},
         {"name": "field.fqdn", "value": "URL"},

bubble-server/src/main/resources/models/apps/bubble_block/bubbleApp_bubbleBlock_matchers.json

@@ -1,5 +1,5 @@
 [{
-  "name": "BBlock",
+  "name": "BubbleBlock",
   "children": {
     "AppMatcher": [{
       "name": "BubbleBlockMatcher",

bubble-web

@@ -1 +1 @@
-Subproject commit 2b810b27d33e9acb50d6f8954725ab1fa00973c1
+Subproject commit 10df086e32a8e22e8a4b5472161ccdf6936d6b17