[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15055] Syncromind: Merge 14936:15027 from trunk
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [15055] Syncromind: Merge 14936:15027 from trunk |
Date: |
Fri, 13 May 2016 12:05:29 +0000 (UTC) |
Revision: 15055
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15055
Author: sigurdne
Date: 2016-05-13 12:05:29 +0000 (Fri, 13 May 2016)
Log Message:
-----------
Syncromind: Merge 14936:15027 from trunk
Modified Paths:
--------------
branches/dev-syncromind-2/manual/inc/class.uidocuments.inc.php
Modified: branches/dev-syncromind-2/manual/inc/class.uidocuments.inc.php
===================================================================
--- branches/dev-syncromind-2/manual/inc/class.uidocuments.inc.php
2016-05-13 12:05:26 UTC (rev 15054)
+++ branches/dev-syncromind-2/manual/inc/class.uidocuments.inc.php
2016-05-13 12:05:29 UTC (rev 15055)
@@ -142,9 +142,8 @@
$categories = $this->_get_categories($cat_id);
+ self::message_set($this->receipt);
- $msgbox_data =
$this->bocommon->msgbox_data($this->receipt);
-
$file_def = array
(
array('key' => 'file_name', 'label' =>
lang('Filename'), 'sortable' => false),
@@ -175,7 +174,6 @@
$data = array
(
'datatable_def' => $datatable_def,
- 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
'categories' => array('options' => $categories),
'editable' => $mode == 'edit',
'multiple_uploader' => $mode == 'edit' ? true :
'',
@@ -284,11 +282,6 @@
'string' => "/manual/{$_cat_id}",
'relatives' => array(RELATIVE_NONE)));
- foreach ($_files as &$_file)
- {
- $_file['path'] =
"{$_cat_id}/{$_file['name']}";
- }
-
$files = array_merge($files, $_files);
}
@@ -323,10 +316,9 @@
$values = array();
foreach ($out as $_entry)
{
- $values[] = array
- (
- 'file_name' => "<a
href='{$link_view_file}&file_name={$_entry['path']}' target='_blank'
title='{$lang_view}'>{$_entry['name']}</a>",
- 'delete_file' => "<input
type='checkbox' name='file_action[]' value='{$_entry['name']}'
title='$lang_delete'>",
+ $values[] = array(
+ 'file_name' => "<a
href='{$link_view_file}&file_id={$_entry['file_id']}' target='_blank'
title='{$lang_view}'>{$_entry['name']}</a>",
+ 'delete_file' => "<input
type='checkbox' name='file_action[]' value='{$_entry['file_id']}'
title='$lang_delete'>",
);
}
@@ -351,12 +343,7 @@
{
return lang('no access');
}
-
- $bofiles = CreateObject('property.bofiles', '/manual');
-
- $file_name =
html_entity_decode(urldecode(phpgw::get_var('file_name')));
- $file = "{$bofiles->fakebase}/{$file_name}";
- $bofiles->view_file('', $file);
+ ExecMethod('property.bofiles.get_file',
phpgw::get_var('file_id', 'int'));
}
/**
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15055] Syncromind: Merge 14936:15027 from trunk,
sigurdne <=