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

Merge branch 'regs' into 3.6

Browse Source
This commit is contained in:
Romain Neutron
2012-01-04 18:08:33 +01:00
parent 30e4b37888 d04ba1e76c
commit b1710cabb6
6 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
www/prod/jquery.edit.js
View File

@@ -1840,6 +1840,7 @@ function preset_load(preset_id)
{
p4.edit.T_records[r].fields[""+i] = {
value:[],
"meta_struct_id":p4.edit.T_fields[i].meta_struct_id,
dirty:true
};// = {
var n = 0;
@@ -1853,6 +1854,7 @@ function preset_load(preset_id)
{
p4.edit.T_records[r].fields[""+i] = {
"value":p4.edit.T_fields[i].preset[0],
"meta_struct_id":p4.edit.T_fields[i].meta_struct_id,
"dirty":true
};
}
@@ -1875,7 +1877,6 @@ function preset_load(preset_id)
function hsplit1()
{
var el = $('#EDIT_TOP');