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

Merge pull request #136 from nlegoff/add_element_basket

Browse Source 
fix #742 add images to a basket from story detailled view
This commit is contained in:
Romain Neutron
2012-06-19 09:07:02 -07:00
parent e490ebf407 16cb63b34e
commit 88c3581f62
3 changed files with 45 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/Alchemy/Phrasea/Controller/Prod/Basket.php
View File

@@ -63,19 +63,9 @@ class Basket implements ControllerProviderInterface
$n = 0;
foreach (explode(';', $request->get('lst')) as $sbas_rec) {
$sbas_rec = explode('_', $sbas_rec);
$helper = new \Alchemy\Phrasea\Helper\Record\Basket($app['Core'], $app['request']);
if (count($sbas_rec) !== 2)
continue;
$record = new \record_adapter($sbas_rec[0], $sbas_rec[1]);
if ( ! $user->ACL()->has_access_to_base($record->get_base_id())
&& ! $user->ACL()->has_hd_grant($record)
&& ! $user->ACL()->has_preview_grant($record)) {
continue;
}
foreach ($helper->get_elements() as $record) {
if ($Basket->hasRecord($record))
continue;
@@ -344,20 +334,9 @@ class Basket implements ControllerProviderInterface
$n = 0;
foreach (explode(';', $request->get('lst')) as $sbas_rec) {
$sbas_rec = explode('_', $sbas_rec);
if (count($sbas_rec) !== 2)
continue;
$record = new \record_adapter($sbas_rec[0], $sbas_rec[1]);
if ( ! $user->ACL()->has_access_to_base($record->get_base_id())
&& ! $user->ACL()->has_hd_grant($record)
&& ! $user->ACL()->has_preview_grant($record)) {
continue;
}
$helper = new \Alchemy\Phrasea\Helper\Record\Basket($app['Core'], $app['request']);
foreach ($helper->get_elements() as $record) {
if ($basket->hasRecord($record))
continue;

31
lib/Alchemy/Phrasea/Helper/Record/Basket.php Normal file
View File

@@ -0,0 +1,31 @@
<?php
/*
* This file is part of Phraseanet
*
* (c) 2005-2012 Alchemy
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Alchemy\Phrasea\Helper\Record;
use Alchemy\Phrasea\Helper\Record\Helper as RecordHelper;
use Symfony\Component\HttpFoundation\Request;
/**
* Edit Record Helper
* This object handles /edit/ request and filters records that user can edit
*
* It prepares metadatas, databases structures.
*
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
class Basket extends RecordHelper
{
protected $flatten_groupings = true;
}

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

@@ -82,7 +82,7 @@ var p4 = p4 || {};
{
return;
}
var order = $(this).val();
getContent(active, order);
@@ -287,9 +287,9 @@ var p4 = p4 || {};
{
console.log('Reload content for ', header);
}
var url = $('a', header).attr('href');
if(typeof order !== 'undefined')
{
url += '?order=' + order;
@@ -432,7 +432,11 @@ var p4 = p4 || {};
}
else if(singleSelection)
{
lstbr = [$(from).attr('id').split('_').slice(1,3).join('_') ];
if(from.length == 1) {
lstbr = [$(from).attr('id').split('_').slice(1,3).join('_') ];
} else {
lstbr = [$(from).selector.split('_').slice(1,3).join('_') ]
}
}
else
{
@@ -582,9 +586,10 @@ var p4 = p4 || {};
'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);
return dropOnBask(event, $('#IMGT_'+ sbas_id +'_'+ record_id), $('#baskets .SSTT.active'), singleSelection);
}
},
'reloadCurrent':function(){