diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb index 47e21ddc..167ba7bf 100644 --- a/app/models/dmsf_folder.rb +++ b/app/models/dmsf_folder.rb @@ -441,15 +441,18 @@ class DmsfFolder < ActiveRecord::Base # 11 - (position) pos += 1 return pos if column == 'position' - # 12 - (size) + # 12 - (size calculated) pos += 1 return pos if column == 'size_calculated' - # 13 - (modified) + # 13 - (modified calculated) pos += 1 return pos if column == 'modified_calculated' - # 14 - (version) + # 14 - (version calculated) pos += 1 return pos if column == 'version_calculated' + # 15 - (clear title) + pos += 1 + return pos if column == 'clear_title' nil end diff --git a/app/views/dmsf/_dir.html.erb b/app/views/dmsf/_dir.html.erb index 4bd84d31..a3b3ee42 100644 --- a/app/views/dmsf/_dir.html.erb +++ b/app/views/dmsf/_dir.html.erb @@ -129,3 +129,4 @@ 0 <%= subfolder.modified.to_i if subfolder %> 0 +<%= title %> diff --git a/app/views/dmsf/_dir_trash.html.erb b/app/views/dmsf/_dir_trash.html.erb index de2ebb58..26dd2c1e 100644 --- a/app/views/dmsf/_dir_trash.html.erb +++ b/app/views/dmsf/_dir_trash.html.erb @@ -88,3 +88,4 @@ 0 <%= subfolder.modified.to_i if subfolder %> 0 +<%= title %> diff --git a/app/views/dmsf/_file.html.erb b/app/views/dmsf/_file.html.erb index 42515bef..e4b8f490 100644 --- a/app/views/dmsf/_file.html.erb +++ b/app/views/dmsf/_file.html.erb @@ -140,3 +140,4 @@ <%= file.last_revision.size %> <%= file.last_revision.updated_at.to_i %> <%= file.last_revision.iversion %> +<%= title %> diff --git a/app/views/dmsf/_file_trash.html.erb b/app/views/dmsf/_file_trash.html.erb index 0a5b3ada..332478ab 100644 --- a/app/views/dmsf/_file_trash.html.erb +++ b/app/views/dmsf/_file_trash.html.erb @@ -82,3 +82,4 @@ <%= file.last_revision.size %> <%= file.last_revision.updated_at.to_i %> <%= file.last_revision.iversion %> +<%= title %> diff --git a/app/views/dmsf/_list_view.erb b/app/views/dmsf/_list_view.erb index ba66d5c8..ae320033 100644 --- a/app/views/dmsf/_list_view.erb +++ b/app/views/dmsf/_list_view.erb @@ -60,9 +60,10 @@ <% end %> <%# controls %> <%# position %> - <%# size %> - <%# updated %> - <%# version %> + <%# size calculated %> + <%# modified calculated %> + <%# version calculated %> + <%# clear title %> diff --git a/app/views/dmsf/_tree_view.erb b/app/views/dmsf/_tree_view.erb index 57300710..43333269 100644 --- a/app/views/dmsf/_tree_view.erb +++ b/app/views/dmsf/_tree_view.erb @@ -61,9 +61,10 @@ <% end %> <%# controls %> <%# position %> - <%# size %> - <%# updated %> - <%# version %> + <%# size calculated %> + <%# modified calculated %> + <%# version calculated %> + <%# clear title %> diff --git a/app/views/dmsf/_url.html.erb b/app/views/dmsf/_url.html.erb index cc6247be..ef2b0ea7 100644 --- a/app/views/dmsf/_url.html.erb +++ b/app/views/dmsf/_url.html.erb @@ -82,3 +82,4 @@ link.updated_at.to_i +<%= title %> diff --git a/app/views/dmsf/_url_trash.html.erb b/app/views/dmsf/_url_trash.html.erb index 2e2e0716..d149ded5 100644 --- a/app/views/dmsf/_url_trash.html.erb +++ b/app/views/dmsf/_url_trash.html.erb @@ -68,5 +68,6 @@ 1 -link.updated_at.to_i +<%= link.updated_at.to_i %> +<%= title %> diff --git a/app/views/dmsf/show.html.erb b/app/views/dmsf/show.html.erb index 4bc7cdd0..b8b1ab09 100644 --- a/app/views/dmsf/show.html.erb +++ b/app/views/dmsf/show.html.erb @@ -138,6 +138,7 @@ <% version_calculated = DmsfFolder.get_column_position('version_calculated') %> <% size = DmsfFolder.get_column_position('size') %> <% modified = DmsfFolder.get_column_position('modified') %> + <% clear_title = DmsfFolder.get_column_position('clear_title') %> <%= late_javascript_tag do %> $("#browser").dataTable({ @@ -157,8 +158,11 @@ columnDefs: [ { responsivePriority: 1, targets: <%= title %> }, { responsivePriority: 2, targets: <%= commands %> }, - { searchable: false, targets: [0, <%= commands %>, <%= position %>, <%= size_calculated %>, <%= modified_calculated %>, <%= version_calculated %>] }, + { searchable: false, targets: [0, <%= commands %>, <%= position %>, <%= size_calculated %>, <%= modified_calculated %>, <%= version_calculated %>, <%= clear_title %>] }, { sortable: false, targets: [0, <%= commands %>] } + <% if title %> + ,{ iDataSort: <%= clear_title %>, targets: [ <%= title %> ] } + <% end %> <% if size %> ,{ iDataSort: <%= size_calculated %>, targets: [ <%= size %> ] } <% end %> diff --git a/app/views/dmsf/trash.html.erb b/app/views/dmsf/trash.html.erb index 7948be8f..1bc35b32 100644 --- a/app/views/dmsf/trash.html.erb +++ b/app/views/dmsf/trash.html.erb @@ -83,9 +83,10 @@ <% end %> <%# controls %> <%# position %> - <%# size %> - <%# updated %> - <%# version %> + <%# size calculated %> + <%# modified calculated %> + <%# version calculated %> + <%# clear title %> @@ -182,6 +183,7 @@ <% version_calculated = DmsfFolder.get_column_position('version_calculated') %> <% size = DmsfFolder.get_column_position('size') %> <% modified = DmsfFolder.get_column_position('modified') %> + <% clear_title = DmsfFolder.get_column_position('clear_title') %> <%= late_javascript_tag do %> $('#browser').dataTable({ @@ -201,8 +203,11 @@ columnDefs: [ { responsivePriority: 1, targets: <%= title %> }, { responsivePriority: 2, targets: <%= commands %> }, - { searchable: false, targets: [0, <%= commands %>, <%= position %>, <%= size_calculated %>, <%= modified_calculated %>, <%= version_calculated %>] }, + { searchable: false, targets: [0, <%= commands %>, <%= position %>, <%= size_calculated %>, <%= modified_calculated %>, <%= version_calculated %>, <%= clear_title %>] }, { sortable: false, targets: [0, <%= commands %>] } + <% if title %> + ,{ iDataSort: <%= clear_title %>, targets: [ <%= title %> ] } + <% end %> <% if size %> ,{ iDataSort: <%= size_calculated %>, targets: [ <%= size %> ] } <% end %>