holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix click on resources picture in edit dialog doesn't open expose view

Browse Source
This commit is contained in:
Hadi Nategh 2015-04-09 10:48:45 +00:00
parent 264899f0db
commit 6abaf60a22
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/inc/class.resources_bo.inc.php
View File

@ -820,8 +820,7 @@ class resources_bo
else else
{ {
$picture = egw::link('/etemplate/thumbnail.php', array( $picture = egw::link('/etemplate/thumbnail.php', array(
'path' => $picture, 'path' => $picture
'thheight' => 128,
)); ));
} }
break; break;

5
resources/inc/class.resources_ui.inc.php
View File

@ -506,7 +506,10 @@ class resources_ui
// some presetes // some presetes
$content['resource_picture'] = $this->bo->get_picture($content['res_id'],false); $content['resource_picture'] = $this->bo->get_picture($content['res_id'],false);
$content['picture_original'] = $this->bo->get_picture($content['res_id'],true); // Set original size picture
$content['picture_original'] = $content['picture_src'] == 'own_src'?
'webdav.php/apps/resources/'.$content['res_id'].'/.picture.jpg': $this->bo->get_picture($content['res_id'],true);
$content['quantity'] = $content['quantity'] ? $content['quantity'] : 1; $content['quantity'] = $content['quantity'] ? $content['quantity'] : 1;
$content['useable'] = $content['useable'] ? $content['useable'] : 1; $content['useable'] = $content['useable'] ? $content['useable'] : 1;
$content['accessory_of'] = $content['accessory_of'] ? $content['accessory_of'] : $accessory_of; $content['accessory_of'] = $content['accessory_of'] ? $content['accessory_of'] : $accessory_of;

4
resources/templates/default/edit.xet
View File

@ -67,9 +67,7 @@
</rows> </rows>
</grid> </grid>
<description/> <description/>
<vbox> <image src="resource_picture" href="$cont[picture_original]" expose_view="true" align="center"/>
<image src="resource_picture" href="$cont[picture_original]" extra_link_popup="600x480" extra_link_target="_blank" align="center" />
</vbox>
</row> </row>
</rows> </rows>
</grid> </grid>