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

Merge branch '3.8'

Browse Source 
Conflicts:
	.travis.yml
	templates/web/setup/wrapper.html.twig
	tests/Alchemy/Tests/Phrasea/Authentication/AuthenticatorTest.php
This commit is contained in:
Romain Neutron
2013-11-05 15:20:35 +01:00
parent 414f6b60af 68cba5d061
commit f27fa53d4c
19 changed files with 113 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
www/scripts/apps/admin/fields/views/edit.js
View File

@@ -89,11 +89,22 @@ define([
"blur input#tbranch": "fieldChangedAction",
"blur input#separator": "fieldChangedAction",
"blur input#tag": "tagFieldChangedAction",
"change select#vocabulary-type": "triggerControlledVocabulary",
"keyup input.input-label": "labelChangedAction",
"change input[type=checkbox]": "fieldChangedAction",
"change select": "selectionChangedAction",
"click .lng-label a": "_toggleLabels"
},
triggerControlledVocabulary: function(e) {
if ($(e.target, this.$el).find("option:selected").val() === "") {
this.model.set("vocabulary-type", false);
this.render();
} else if ($("input#vocabulary-restricted", this.$el).length === 0) {
this.model.set("vocabulary-restricted", false);
this.model.set("vocabulary-type", $(e.target, this.$el).find("option:selected").val());
this.render();
}
},
selectionChangedAction: function(e) {
var field = $(e.target);
var data = {};