forge-joniko/ldc-dam
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Fix new picture on existing media with folder selection

Browse source
This commit is contained in:
Vincent BRIDIER 2020-04-02 12:23:11 +02:00
parent 93154e2574
commit bb0531f779
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/js/app.js vendored
View file

File diff suppressed because one or more lines are too long

13
resources/js/media.js vendored
View file

@ -578,6 +578,7 @@ $(document).ready(function() {
depot: $(this).attr('data-depot'),
typemedia: $(this).attr('data-typemedia'),
ext: $(this).attr('data-ext'),
dossier_id: $(this).attr('data-dossier')
}, drPlugin, viewer);
});
@ -617,6 +618,7 @@ $(document).ready(function() {
depot: 0,
typemedia: result.typemedia_id,
ext: result.extension,
dossier_id: result.dossier_id
}, drPlugin, viewer);
},
error: function (error) {
@ -990,6 +992,7 @@ $(document).ready(function() {
depot: 0,
typemedia: result.datas.typemedia_id,
ext: result.datas.extension,
dossier_id: result.dossier_id
}, drPlugin, viewer);
$("#form_media .form_media_edit").trigger("click");
$(".media_container .loader").hide();
@ -1007,7 +1010,7 @@ $(document).ready(function() {
event.preventDefault();
$('.upload_container').show("fast");
maxFiles = 1;
replaceMediaId =$(window).data('current_edit_media');
replaceMediaId = $(window).data('current_edit_media');
});
// ---- Bouton pour lancer le téléchargement d'un ou plusieurs médias
@ -1138,6 +1141,7 @@ $(document).ready(function() {
depot: 0,
typemedia: result.datas.typemedia_id,
ext: result.datas.extension,
dossier_id: result.dossier_id
}, drPlugin, viewer);
$.fancyMessage({title : "Sauvegarde d'un média", message : "Les données ont bien été enregistrées", type : "info"});
@ -1230,6 +1234,7 @@ $(document).ready(function() {
depot: 0,
typemedia: result.typemedia_id,
ext: result.extension,
dossier_id: result.dossier_id
}, drPlugin, viewer);
$(".media_container .loader").hide();
@ -1395,6 +1400,7 @@ $(document).ready(function() {
depot: 0,
typemedia: data.result.files[0].typemedia_id,
ext: data.result.files[0].extension,
dossier_id: data.result.files[0].dossier_id
}, drPlugin, viewer);
}else{
if (currentfiles.length === uploadedFiles.length){
@ -1714,7 +1720,7 @@ window.loadMedia = function(sujet_id, saveSearch = 0){
output += '<div class="imageItem" data-id="'+item.id+'" data-depot="'+result.isDepot+'" data-ext="'+item.extension+'" data-typemedia="'+item.typemedia_id+'" data-preview="'+preview+'" data-src="'+item.folder+item.uid+"."+item.extension+'" draggable="'+draggable+'" aria-grabbed="false">';
output += '<div class="imageItem" data-id="'+item.id+'" data-depot="'+result.isDepot+'" data-ext="'+item.extension+'" data-typemedia="'+item.typemedia_id+'" data-preview="'+preview+'" data-src="'+item.folder+item.uid+"."+item.extension+'" data-dossier="'+ item.dossier_id +'" draggable="'+draggable+'" aria-grabbed="false">';
output += '<div class="etiquette" style="background-color:'+item.etiquette.color+'; border-color:'+item.etiquette.color+';" data-id="'+item.etiquette.etiquette_id+'" >'+item.etiquette.libelle+'</div>';
output += '<div class="contextMenu"><ul>';
output += '<li class="menu-option editItem"><i class="fas fa-edit"></i> Editer</li>';
@ -2213,6 +2219,9 @@ window.openEditor = function (obj, drPlugin, viewer, tab = false) {
// affiche la popin
$("#form_media").fadeIn('fast');
// On sélectionne le dossier correspondant
$('.dd3-item[data-id='+ obj.dossier_id +'] > .dd3-content').trigger("click");
},
error: function(jqXHR, textStatus, errorThrown) {
// si le plugin de retouche a déjà été chargé

4
resources/views/layouts/app.blade.php
View file

@ -7,7 +7,7 @@
<title>{{ config('app.name', 'Laravel') }}</title>
<!-- Styles -->
<link href="{{ asset('css/jquery.fancybox.min.css') }}" rel="stylesheet">
<link href="{{ asset('css/app.css') }}?ver=1.3" rel="stylesheet">
<link href="{{ asset('css/app.css') }}?ver=1.5" rel="stylesheet">
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-148734400-1"></script>
<script>
@ -63,7 +63,7 @@
<!-- Scripts -->
<script src="{{ asset('js/jquery.fancybox.min.js') }}" defer></script>
<script src="{{ asset('js/app.js') }}?ver=1.3"></script>
<script src="{{ asset('js/app.js') }}?ver=1.5"></script>
@yield('scripts')
</body>
</html>