PHRAS-1177_change-multi-on-field

- change : no more "multi" checkbox when creating a field - new field is not "report" anymore #time 1h
alchemy-fr · Jun 27, 2016 · e10a6f8 · e10a6f8
1 parent 351dc5e
commit e10a6f8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/lib/classes/databox/field.php b/lib/classes/databox/field.php
@@ -923,8 +923,8 @@ public static function create(Application $app, databox $databox, $name)
           `thumbtitle`, `multi`, `business`, `aggregable`,
           `report`, `sorter`, `separator`)
         VALUES (null, :name, '', 0, 0, 1, 'string', '',
-          null, 0,
-          0, 0, 1, :sorter, '')";
+          null, 0, 0, 0,
+           1, :sorter, '')";
 
         $name = self::generateName($name);
 

diff --git a/templates/web/admin/fields/templates.html.twig b/templates/web/admin/fields/templates.html.twig
@@ -60,13 +60,11 @@
                     </div>
                     <div class="control-group">
                         <div class="controls">
-                            <label class="checkbox">
-                                <input id="new-multivalued" type="checkbox">{% trans %}Multivalued{% endtrans %}
-                            </label>
                             <button type="button" class="btn btn-success btn-submit-field"><i class="icon-ok icon-white"></i>{% trans %}Add{% endtrans %}</button>
                             <button type="button" class="btn btn-cancel-field">{% trans %}Cancel{% endtrans %}</button>
                         </div>
                     </div>
+                    <input id="new-multivalued" type="hidden" />
                 </form>
             </div>
         </div>

diff --git a/www/scripts/apps/admin/fields/views/create.js b/www/scripts/apps/admin/fields/views/create.js
@@ -130,7 +130,8 @@ define([
                 "label_fr": $("#new-label_fr", this.$el).val(),
                 "label_de": $("#new-label_de", this.$el).val(),
                 "label_nl": $("#new-label_nl", this.$el).val(),
-                "multi": $("#new-multivalued", this.$el).is(":checked")
+                "multi": $("#new-multivalued", this.$el).is(":checked"),
+                "report": false
             });
 
             field.save(null, {