extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 17:42:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Add app filter

Browse Source 
- List should be comma separated
- Add attachments translation
This commit is contained in:
Nathan Gray 2011-10-25 22:50:05 +00:00
parent adfe721ba7
commit 18e38b1dfc
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etemplate/inc/class.bo_merge.inc.php
View File

@ -300,15 +300,15 @@ abstract class bo_merge
*
* Uses egw_link system to get link titles
*/
protected function get_links($app, $id)
protected function get_links($app, $id, $only_app)
{
$links = egw_link::get_links($app, $id);
$links = egw_link::get_links($app, $id, $only_app);
$link_titles = array();
foreach($links as $link_id => $link_info)
{
$link_titles[] = egw_link::title($link_info['app'], $link_info['id']);
}
return implode("\n",$link_titles);
return implode(", ",$link_titles);
}
/**

1
etemplate/lang/egw_en.lang
View File

@ -252,6 +252,7 @@ linkentry etemplate en Link entry
linklist etemplate en Link list
linkstring etemplate en Link string
linkto etemplate en Link to
list of files linked to the current record preferences en List of files linked to the current record
load this template into the editor etemplate en Load template to the editor
maximum size for uploads filemanager en Maximum upload size
message ... etemplate en Message ...