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

Merge branch 4.0

Browse Source
This commit is contained in:
Thibaud Fabre
2016-12-05 15:26:48 +01:00
parent f6700fbe12
commit b5bbb1851f
315 changed files with 6552 additions and 29445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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_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, {

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

@@ -93,7 +93,8 @@ define([
"keyup input.input-label": "labelChangedAction",
"change input[type=checkbox]": "fieldChangedAction",
"change select": "selectionChangedAction",
"click .lng-label a": "_toggleLabels"
"click .lng-label a": "_toggleLabels",
"click input#multi": "multiClickdAction"
},
triggerControlledVocabulary: function (e) {
if ($(e.target, this.$el).find("option:selected").val() === "") {
@@ -133,6 +134,16 @@ define([
return this;
},
multiClickdAction: function (e) {
if($(e.target).is(":checked")) {
$("#separatorZone").show();
}
else {
$("#separatorZone").hide();
}
return this;
},
tagFieldChangedAction: function (e) {
var $this = this;
var fieldTag = $(e.target);
@@ -154,7 +165,7 @@ define([
} else {
$this.fieldChangedAction(e);
}
}
};
if ("" !== fieldTagValue) {
var jqxhr = $.get("/admin/fields/tags/" + fieldTagValue, onFieldValid).fail(function () {

2
www/scripts/apps/admin/main/app.js
View File

@@ -38,7 +38,7 @@ define([
},
success: function(data){
if (data) {
manageSession(data);
commonModule.manageSession(data);
}
var t = 120000;
if (data.apps && parseInt(data.apps) > 1) {