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

Merge pull request #514 from romainneutron/fix-1339

Browse Source 
Fix #1339 : Fix admin file upload callback
This commit is contained in:
Romain Neutron
2013-07-17 04:08:47 -07:00
parent 3cdfbf8d60 93db8d79db
commit 202b4f016d
6 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Alchemy/Phrasea/Controller/Admin/Root.php
View File

@@ -286,8 +286,28 @@ class Root implements ControllerProviderInterface
break;
}
if (isset($status[$bit])) {
$status = $status[$bit];
} else {
$status = array(
"labeloff" => '',
"labelon" => '',
"img_off" => '',
"img_on" => '',
"path_off" => '',
"path_on" => '',
"searchable" => false,
"printable" => false,
);
foreach ($app['locales.I18n.available'] as $code => $language) {
$status['labels_on'][$code] = null;
$status['labels_off'][$code] = null;
}
}
return $app['twig']->render('admin/statusbit/edit.html.twig', array(
'status' => isset($status[$bit]) ? $status[$bit] : array(),
'status' => $status,
'errorMsg' => $errorMsg
));
})->assert('databox_id', '\d+')

7
templates/web/admin/collection/collection.html.twig
View File

@@ -323,12 +323,7 @@
$('#right-ajax').empty().addClass('loading');
},
done: function (e, data) {
$('#right-ajax').removeClass('loading').html(data.result);
enableForms($('#right-ajax form:not(.no-ajax)'));
$.each($('#right-ajax a'),function(i, el){
enableLink($(el));
});
enableFormsCallback(data.result);
}
});
});

7
templates/web/admin/databox/databox.html.twig
View File

@@ -385,12 +385,7 @@
$('#right-ajax').empty().addClass('loading');
},
done: function (e, data) {
$('#right-ajax').removeClass('loading').html(data.result);
enableForms($('#right-ajax form:not(.no-ajax)'));
$.each($('#right-ajax a'),function(i, el){
enableLink($(el));
});
enableFormsCallback(data.result);
}
});
});

34
templates/web/admin/index.html.twig
View File

@@ -78,21 +78,24 @@
type: method,
url: url,
data: datas,
success: function(datas){
$('#right-ajax').removeClass('loading').html(datas);
enableForms($('#right-ajax form:not(.no-ajax)'));
$.each($('#right-ajax a'),function(i, el){
enableLink($(el));
});
return;
}
success: enableFormsCallback
});
return false;
}
});
}
function enableFormsCallback(datas)
{
$('#right-ajax').removeClass('loading').html(datas);
enableForms($('#right-ajax form:not(.no-ajax)'));
$.each($('#right-ajax a'),function(i, el){
enableLink($(el));
});
return;
}
function enableLink(link) {
$(link).bind('click',function(event){
@@ -103,11 +106,7 @@
$('#right-ajax').empty().addClass('loading').parent().show();
$.get(dest, function(data) {
$('#right-ajax').removeClass('loading').html(data);
enableForms($('#right-ajax form:not(.no-ajax)'));
$.each($('#right-ajax a:not(.no-ajax)'),function(i, el){
enableLink($(el));
});
enableFormsCallback(data);
});
return false;
}
@@ -129,12 +128,7 @@
$('#right-ajax').empty().addClass('loading').parent().show();
$.get(dest, function(data) {
$('#right-ajax').removeClass('loading').html(data);
enableForms($('#right-ajax form:not(.no-ajax)'));
$.each($('#right-ajax a'),function(i, el){
enableLink($(el));
});
enableFormsCallback(data);
});
$('#tree .selected').removeClass('selected');
$(this).parent().addClass('selected');

3
templates/web/admin/statusbit/edit.html.twig
View File

@@ -192,8 +192,7 @@ $(document).ready(function(){
$('#right-ajax').empty().addClass('loading');
},
done: function (e, data) {
$('#right-ajax').removeClass('loading').html(data.result);
enableFormsCallback(data.result);
}
});

7
templates/web/admin/user/import/file.html.twig
View File

@@ -62,12 +62,7 @@ $(function () {
$('#right-ajax').empty().addClass('loading');
},
done: function (e, data) {
$('#right-ajax').removeClass('loading').html(data.result);
enableForms($('#right-ajax form:not(.no-ajax)'));
$.each($('#right-ajax a'),function(i, el){
enableLink($(el));
});
enableFormsCallback(data.result);
}
});
});