Browse Source

Use standard modelMixin instead of fields.wildcard

Call it fields.generic in exports - it has the same meaning for merlin
code (any field that Merlin provides), less code the better.

Change-Id: Id2eb8fbfa477c014f6e6eebdd9fb0e4298bb029c
changes/35/209235/2
Timur Sufiev 3 years ago
parent
commit
c25b7d8507

+ 1
- 1
extensions/mistral/static/mistral/js/mistral.workbook.models.js View File

@@ -84,7 +84,7 @@
84 84
             })
85 85
           },
86 86
           'value': {
87
-            '@class': fields.wildcard,
87
+            '@class': fields.generic,
88 88
             '@factory': varlistValueFactory
89 89
           }
90 90
         })

+ 1
- 6
merlin/static/merlin/js/merlin.field.models.js View File

@@ -9,10 +9,6 @@
9 9
   merlinFieldModels.$inject = ['merlin.utils'];
10 10
 
11 11
   function merlinFieldModels(utils) {
12
-    var wildcardMixin = Barricade.Blueprint.create(function() {
13
-      return this;
14
-    });
15
-
16 12
     var viewChoicesMixin = Barricade.Blueprint.create(function() {
17 13
       var self = this;
18 14
       var dropDownLimit = this._dropDownLimit || 5;
@@ -127,7 +123,6 @@
127 123
         }
128 124
         return title;
129 125
       };
130
-      wildcardMixin.call(this);
131 126
       if ( this.getEnumValues ) {
132 127
         viewChoicesMixin.call(this);
133 128
       }
@@ -290,7 +285,7 @@
290 285
       linkedcollection: linkedCollectionModel,
291 286
       dictionary: dictionaryModel,
292 287
       frozendict: frozendictModel,
293
-      wildcard: wildcardMixin // use for most general type-checks
288
+      generic: modelMixin // use for most general type-checks
294 289
     };
295 290
   }
296 291
 })();

Loading…
Cancel
Save