hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-14 05:23:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-1177_change-multi-on-field

Browse Source 
- change : no more "multi" checkbox when creating a field
- new field is not "report" anymore
#time 1h
This commit is contained in:
Jean-Yves Gaulier
2016-06-27 16:45:51 +02:00
parent 351dc5e0c7
commit e10a6f8ebd
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/classes/databox/field.php
View File

@@ -923,8 +923,8 @@ class databox_field implements cache_cacheableInterface
`thumbtitle`, `multi`, `business`, `aggregable`, `thumbtitle`, `multi`, `business`, `aggregable`,
`report`, `sorter`, `separator`) `report`, `sorter`, `separator`)
VALUES (null, :name, '', 0, 0, 1, 'string', '', VALUES (null, :name, '', 0, 0, 1, 'string', '',
null, 0, null, 0, 0, 0,
0, 0, 1, :sorter, '')"; 1, :sorter, '')";
$name = self::generateName($name); $name = self::generateName($name);

4
templates/web/admin/fields/templates.html.twig
View File

@@ -60,13 +60,11 @@
</div> </div>
<div class="control-group"> <div class="control-group">
<div class="controls"> <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-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> <button type="button" class="btn btn-cancel-field">{% trans %}Cancel{% endtrans %}</button>
</div> </div>
</div> </div>
<input id="new-multivalued" type="hidden" />
</form> </form>
</div> </div>
</div> </div>

3
www/scripts/apps/admin/fields/views/create.js
View File

@@ -130,7 +130,8 @@ define([
"label_fr": $("#new-label_fr", this.$el).val(), "label_fr": $("#new-label_fr", this.$el).val(),
"label_de": $("#new-label_de", this.$el).val(), "label_de": $("#new-label_de", this.$el).val(),
"label_nl": $("#new-label_nl", 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, { field.save(null, {