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

fix #459 Fonction d'ajout au panier via la vignette

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-02-28 19:40:12 +01:00
parent fee8ec33ed
commit 7b0e8633af
5 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/web/common/drop_down_options.html
View File

@@ -10,7 +10,7 @@
{% if user.ACL.has_right_on_base(record.get_base_id, 'canputinalbum') and not record.is_grouping() %} {% if user.ACL.has_right_on_base(record.get_base_id, 'canputinalbum') and not record.is_grouping() %}
<div title="" class="context-menu-item"> <div title="" class="context-menu-item">
<div class="context-menu-item-inner" <div class="context-menu-item-inner"
onclick="evt_add_in_chutier('{{record.get_base_id}}','{{record.get_record_id}}',false,this);return(false);"> onclick="evt_add_in_chutier('{{record.get_base_id}}','{{record.get_record_id}}',false,true);return(false);">
{% trans 'action : ajouter au panier' %} {% trans 'action : ajouter au panier' %}
</div> </div>
</div> </div>

2
templates/web/prod/preview/tools.html
View File

@@ -2,7 +2,7 @@
{% if (record.is_from_basket is empty) and user.ACL().has_right_on_base(record.get_base_id(), 'canputinalbum') %} {% if (record.is_from_basket is empty) and user.ACL().has_right_on_base(record.get_base_id(), 'canputinalbum') %}
<div sbas="{{record.get_sbas_id()}}" id="PREV_BASKADD_{{record.get_serialize_key}}" <div sbas="{{record.get_sbas_id()}}" id="PREV_BASKADD_{{record.get_serialize_key}}"
class="baskAdder" title="{% trans 'action : ajouter au panier' %}" class="baskAdder" title="{% trans 'action : ajouter au panier' %}"
onclick="evt_add_in_chutier('{{record.get_base_id()}}','{{record.get_record_id()}}',false,this);return(false);"></div> onclick="evt_add_in_chutier('{{record.get_base_id()}}','{{record.get_record_id()}}',false);return(false);"></div>
{% endif %} {% endif %}
<div class="printer" title="'{% trans 'action : print' %}" <div class="printer" title="'{% trans 'action : print' %}"

2
templates/web/prod/results/record.html
View File

@@ -7,7 +7,7 @@
{% if entry_id %} {% if entry_id %}
<div style="width:{{th_size+30}}px;" sbas="{{sbas_id}}" <div style="width:{{th_size+30}}px;" sbas="{{sbas_id}}"
id="{{ prefix|default('IMGT') }}_{{record.get_sbas_id}}_{{record.get_record_id}}" id="{{ prefix|default('IMGT') }}_{{record.get_sbas_id}}_{{record.get_record_id}}"
class="IMGT diapo grouping type-{{record.get_type}}" class="IMGT diapo type-{{record.get_type}}"
onDblClick="openPreview('FEED',{{record.get_number()}},{{entry_id}});"> onDblClick="openPreview('FEED',{{record.get_number()}},{{entry_id}});">
{% elseif record.is_grouping() %} {% elseif record.is_grouping() %}
<div style="width:{{th_size+30}}px;" sbas="{{sbas_id}}" <div style="width:{{th_size+30}}px;" sbas="{{sbas_id}}"

20
www/prod/jquery.WorkZone.js
View File

@@ -378,12 +378,7 @@ var p4 = p4 || {};
} }
function dropOnBask(event,from,destKey, singleSelection)
function dropOnBask(event,from,destKey)
{ {
var action = "", var action = "",
from = $(from), dest_uri = '', lstbr = [], from = $(from), dest_uri = '', lstbr = [],
@@ -420,10 +415,14 @@ var p4 = p4 || {};
if(action=="IMGT2CHU" || action=="IMGT2REG") if(action=="IMGT2CHU" || action=="IMGT2REG")
{ {
if($(from).hasClass('.baskAdder')) if($(from).hasClass('.baskAdder') )
{ {
lstbr = [$(from).attr('id').split('_').slice(2,4).join('_')]; lstbr = [$(from).attr('id').split('_').slice(2,4).join('_')];
} }
else if(singleSelection)
{
lstbr = [$(from).attr('id').split('_').slice(1,3).join('_') ];
}
else else
{ {
lstbr = p4.Results.Selection.get(); lstbr = p4.Results.Selection.get();
@@ -570,6 +569,13 @@ var p4 = p4 || {};
p4.WorkZone = { p4.WorkZone = {
'Selection':new Selectable($('#baskets'), {selector : '.CHIM'}), 'Selection':new Selectable($('#baskets'), {selector : '.CHIM'}),
'refresh':refreshBaskets, 'refresh':refreshBaskets,
'addElementToBasket': function(sbas_id, record_id, event , singleSelection) {
singleSelection = !!singleSelection || false;
if($('#baskets .SSTT.active').length == 1)
{
return dropOnBask(event,$('#IMGT_'+ sbas_id +'_'+ record_id), $('#baskets .SSTT.active'), singleSelection);
}
},
'reloadCurrent':function(){ 'reloadCurrent':function(){
var sstt = $('#baskets .content:visible'); var sstt = $('#baskets .content:visible');
if(sstt.length === 0) if(sstt.length === 0)

6
www/prod/page0.js
View File

@@ -2582,10 +2582,10 @@ function evt_print(value)
printThis("lst="+value); printThis("lst="+value);
} }
function evt_add_in_chutier(a,b,event,el) function evt_add_in_chutier(sbas_id, record_id,event, singleSelection)
{ {
if($('#baskets .SSTT.active').length == 1) var singleSelection = singleSelection || false;
dropOnBask(event,$('#PREV_BASKADD_'+a+'_'+b),$('#baskets .SSTT.active')); p4.WorkZone.addElementToBasket(sbas_id, record_id, event, singleSelection);
} }