redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into devel-2.4.3

Browse Source
This commit is contained in:
Karel Pičman 2020-02-14 10:45:35 +01:00
commit 57030efe4b
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/dmsf_link.rb
View File

@ -105,7 +105,7 @@ class DmsfLink < ActiveRecord::Base
if target_type == DmsfFile.model_name.to_s if target_type == DmsfFile.model_name.to_s
path = target_file.dmsf_path.map { |element| element.is_a?(DmsfFile) ? element.display_name : element.title }.join('/') if target_file path = target_file.dmsf_path.map { |element| element.is_a?(DmsfFile) ? element.display_name : element.title }.join('/') if target_file
else else
path = target_folder ? target_folder.dmsf_path_str : '' path = target_folder ? target_folder.dmsf_path_str : +''
end end
path.insert(0, "#{target_project.name}:") if project_id != target_project_id path.insert(0, "#{target_project.name}:") if project_id != target_project_id
if path && path.length > 50 if path && path.length > 50

1
app/views/dmsf/_url.html.erb
View File

@ -40,7 +40,6 @@
<%= link.external_url %> <%= link.external_url %>
<% end %> <% end %>
</div> </div>
<%= '</span>'.html_safe if @tree_view %>
</td> </td>
<% end %> <% end %>
<% if DmsfFolder.is_column_on?('extension') %> <% if DmsfFolder.is_column_on?('extension') %>

10
assets/javascripts/redmine_dmsf.js
View File

@ -247,10 +247,7 @@ function initPlUploader(uploader, formUrl, maxFileSize, maxFileCount, flashUrl)
list.attr('aria-pressed', 'false'); list.attr('aria-pressed', 'false');
list.removeClass('ui-checkboxradio-radio-label ui-checkboxradio-checked ui-state-active ui-controlgroup-item ui-checkboxradio-label'); list.removeClass('ui-checkboxradio-radio-label ui-checkboxradio-checked ui-state-active ui-controlgroup-item ui-checkboxradio-label');
list.addClass('ui-button-icon-only ui-state-default ui-corner-left'); list.addClass('ui-button-icon-only ui-state-default ui-corner-left');
list.html(` list.html("<span class='ui-button-text'>List</span><span class='ui-button-icon-secondary ui-icon ui-icon-grip-dotted-horizontal'></span>");
<span class="ui-button-text">List</span>
<span class="ui-button-icon-secondary ui-icon ui-icon-grip-dotted-horizontal"></span>
`)
list.click(function () { list.click(function () {
dmsf_plupload_toggle(list, thumbs); dmsf_plupload_toggle(list, thumbs);
}); });
@ -262,10 +259,7 @@ function initPlUploader(uploader, formUrl, maxFileSize, maxFileCount, flashUrl)
thumbs.attr('aria-pressed', 'true'); thumbs.attr('aria-pressed', 'true');
thumbs.removeClass('ui-checkboxradio-radio-label ui-checkboxradio-checked ui-controlgroup-item ui-checkboxradio-label'); thumbs.removeClass('ui-checkboxradio-radio-label ui-checkboxradio-checked ui-controlgroup-item ui-checkboxradio-label');
thumbs.addClass('ui-button-icon-only ui-corner-right'); thumbs.addClass('ui-button-icon-only ui-corner-right');
thumbs.html(` thumbs.html("<span class='ui-button-text'>Thumbnails</span><span class='ui-button-icon-secondary ui-icon ui-icon-image'></span>");
<span class="ui-button-text">Thumbnails</span>
<span class="ui-button-icon-secondary ui-icon ui-icon-image"></span>
`)
thumbs.click(function () { thumbs.click(function () {
dmsf_plupload_toggle(thumbs, list); dmsf_plupload_toggle(thumbs, list);
}); });