Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Files: Support display/title (instead of uid) in sharing form

Browse source
This commit is contained in:
Aleksander Machniak 2019-06-20 08:59:14 +00:00
parent 22bfc61fbf
commit 2a1d9bb6b8
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/kolab_files/kolab_files.js
View file

@ -2929,7 +2929,10 @@ function kolab_files_ui()
.on('click', function() { file_api.sharing_delete(post.folder, $(this).closest('tr'), post.mode); }); .on('click', function() { file_api.sharing_delete(post.folder, $(this).closest('tr'), post.mode); });
if (form_info.list_column) { if (form_info.list_column) {
row.append($('<td>').append($('<span class="name">').text(post[form_info.list_column]))); row.append($('<td>').append($('<span class="name">')
.text(response.result.display || post[form_info.list_column])
.attr('title', response.result.title))
);
} }
else { else {
$.each(form_info.form || [], function(i, v) { $.each(form_info.form || [], function(i, v) {
@ -2945,7 +2948,7 @@ function kolab_files_ui()
content.append(opts).val(post[i]); content.append(opts).val(post[i]);
} }
else { else {
content = $('<span class="name">').text(post[i]); content = $('<span class="name">').text(response.result.display || post[i]).attr('title', response.result.title);
hidden.push($('<input>').attr({type: 'hidden', name: i, value: post[i] || ''})); hidden.push($('<input>').attr({type: 'hidden', name: i, value: post[i] || ''}));
} }

4
plugins/kolab_files/lib/kolab_files_engine.php
View file

@ -450,7 +450,7 @@ class kolab_files_engine
foreach ((array) $info['rights'] as $entry) { foreach ((array) $info['rights'] as $entry) {
if ($entry['mode'] == $mode) { if ($entry['mode'] == $mode) {
if (!empty($tab['list_column'])) { if (!empty($tab['list_column'])) {
$table->add(null, html::span('name', rcube::Q($entry[$tab['list_column']]))); $table->add(null, html::span(array('title' => $entry['title'], 'class' => 'name'), rcube::Q($entry[$tab['list_column']])));
} }
else { else {
foreach ($tab['form'] as $index => $field) { foreach ($tab['form'] as $index => $field) {
@ -458,7 +458,7 @@ class kolab_files_engine
$table->add(null, $fields[$index]->show($entry[$index])); $table->add(null, $fields[$index]->show($entry[$index]));
} }
else if ($fields[$index] instanceof html_inputfield) { else if ($fields[$index] instanceof html_inputfield) {
$table->add(null, html::span('name', rcube::Q($entry[$index]))); $table->add(null, html::span(array('title' => $entry['title'], 'class' => 'name'), rcube::Q($entry[$index])));
} }
} }
} }