#48 errors in the treeview and user's page

This commit is contained in:
Karel Picman 2017-04-26 13:02:03 +02:00
parent c1a5939c7c
commit a1f3fd0ddd
2 changed files with 3 additions and 1 deletions

View File

@ -41,6 +41,7 @@ class DmsfFileRevisionAccess < ActiveRecord::Base
:author_key => "#{DmsfFileRevisionAccess.table_name}.user_id",
:permission => :view_dmsf_file_revision_accesses,
:scope => select("#{DmsfFileRevisionAccess.table_name}.*").
joins(:dmsf_file_revision).joins(:dmsf_file).
joins(:dmsf_file_revision).joins("JOIN #{DmsfFile.table_name} ON dmsf_files.id = dmsf_file_revisions.dmsf_file_id").
joins("JOIN #{Project.table_name} on dmsf_files.project_id = projects.id").
where(["#{DmsfFile.table_name}.deleted = ?", DmsfFile::STATUS_ACTIVE])
end

View File

@ -13,6 +13,7 @@ $("#browser").dataTable().fnDestroy();
// Add rows
$('#<%= params[:row_id] %>').after('<%= escape_javascript(render(:partial => 'dmsf/dmsf_rows')) %>');
hideOnLoad();
// Reinitialize the dataTable
<% title = DmsfFolder.get_column_position('title') %>