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

Merge branch 'master' of github.com:alchemy-fr/Phraseanet

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-01-03 16:17:49 +01:00
parent 6872ceb3db b6899e6d3f
commit 43fbee03c2
42 changed files with 43144 additions and 42186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/classes/module/Lightbox.php
View File

@@ -193,7 +193,8 @@ return call_user_func(
if ($basket->is_valid())
{
$basket->get_first_element()->load_users_infos();
if($basket->get_first_element() instanceof basket_element_adapter)
$basket->get_first_element()->load_users_infos();
}
$twig = new supertwig();

18
lib/classes/module/admin/route/users.class.php
View File

@@ -59,8 +59,8 @@ class module_admin_route_users
, 'like_value' => $request->get('like_value')
, 'sbas_id' => $request->get('sbas_id')
, 'base_id' => $request->get('base_id')
, 'srt' => $request->get("srt")
, 'ord' => $request->get("ord")
, 'srt' => $request->get("srt", User_Query::SORT_CREATIONDATE)
, 'ord' => $request->get("ord", User_Query::ORD_DESC)
, 'per_page' => $results_quantity
, 'offset_start' => $offset_start
);
@@ -68,14 +68,14 @@ class module_admin_route_users
$user = User_Adapter::getInstance($session->get_usr_id(), $appbox);
$query = new User_Query($appbox);
if (is_array($request->get('base_id')))
$query->on_base_ids($request->get('base_id'));
elseif (is_array($request->get('sbas_id')))
$query->on_sbas_ids($request->get('sbas_id'));
if (is_array($this->query_parms['base_id']))
$query->on_base_ids($this->query_parms['base_id']);
elseif (is_array($this->query_parms['sbas_id']))
$query->on_sbas_ids($this->query_parms['sbas_id']);
$this->results = $query->sort_by($request->get("srt"), $request->get("ord"))
->like($request->get('like_field'), $request->get('like_value'))
->get_inactives($request->get('inactives'))
$this->results = $query->sort_by($this->query_parms["srt"], $this->query_parms["ord"])
->like($this->query_parms['like_field'], $this->query_parms['like_value'])
->get_inactives($this->query_parms['inactives'])
->include_templates(true)
->on_bases_where_i_am($user->ACL(), array('canadmin'))
->limit($offset_start, $results_quantity)

8
lib/classes/module/admin/route/users/edit.class.php
View File

@@ -179,13 +179,19 @@ class module_admin_route_users_edit
}
}
$query = new User_Query($appbox);
$templates = $query
->only_templates(true)
->execute()->get_results();
$this->users_datas = $rs;
$out = array(
'datas' => $this->users_datas,
'users' => $this->users,
'users_serial' => implode(';', $this->users),
'base_id' => $this->base_id,
'main_user' => null
'main_user' => null,
'templates'=>$templates
);
if (count($this->users) == 1)

4
lib/classes/module/prod/route/records/edit.class.php
View File

@@ -436,7 +436,7 @@ class module_prod_route_records_edit extends module_prod_route_records_abstract
try
{
$reg_record = $this->get_grouping_head();
$reg_sbas_id = $reg_record->get_base_id();
$reg_sbas_id = $reg_record->get_sbas_id();
$newsubdef_reg = new record_adapter($reg_sbas_id, $request->get('newrepresent'));
@@ -452,7 +452,7 @@ class module_prod_route_records_edit extends module_prod_route_records_abstract
}
catch (Exception $e)
{
}
}

6
lib/classes/module/report/sqlfilter.class.php
View File

@@ -46,7 +46,7 @@ class module_report_sqlfilter
$coll_filter = array();
foreach (explode(',', $list_coll_id) as $val)
{
$coll_filter [] = " position('," . (int) $val . ",' in concat(',' ,coll_list, ',')) > 0 ";
$coll_filter [] = " position('," . phrasea::collFromBas($val) . ",' in concat(',' ,coll_list, ',')) > 0 ";
}
$ret['sql'] = implode(' OR ', $coll_filter);
@@ -207,7 +207,7 @@ class module_report_sqlfilter
{
foreach ($tab as $val)
{
$coll_filter[] = " position('," . (int) $val . ",' in concat(',' ,coll_list, ',')) > 0 ";
$coll_filter[] = " position('," . phrasea::collFromBas($val) . ",' in concat(',' ,coll_list, ',')) > 0 ";
}
$this->filter['collection'] = array('sql' => implode(' OR ', $coll_filter), 'params' => array());
}
@@ -226,7 +226,7 @@ class module_report_sqlfilter
foreach ($tab as $val)
{
$dl_coll_filter[] = "record.coll_id = :record_fil" . $n;
$params[":record_fil" . $n] = $val;
$params[":record_fil" . $n] = phrasea::collFromBas($val);
$n++;
}
$this->filter['record'] = array('sql' => implode(' OR ', $dl_coll_filter), 'params' => $params);