scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-11-10 00:11:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

Update BE sorting for archived fodlers&projects

Browse source 
SCI-5306
This commit is contained in:
Urban Rotnik 2020-12-18 11:22:04 +01:00
parent 7c0ad021de
commit d3e38c89f8
5 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/projects/index.js
View file

@ -8,7 +8,7 @@
// - refactor view handling using library, ex. backbone.js // - refactor view handling using library, ex. backbone.js
/* global Comments CounterBadge animateSpinner initFormSubmitLinks HelperModule /* global Comments CounterBadge animateSpinner initFormSubmitLinks HelperModule
I18n dropdownSelector Sidebar Turbolinks */ dropdownSelector Sidebar Turbolinks */
(function(global) { (function(global) {
var newProjectModal = null; var newProjectModal = null;
@ -533,7 +533,7 @@
// With turbolinks visit all those elements are updated. // With turbolinks visit all those elements are updated.
$(projectsPageSelector).on('click', '.archive-switch', function() { $(projectsPageSelector).on('click', '.archive-switch', function() {
$(projectsPageSelector).find('.projects-container').remove(); $(projectsPageSelector).find('.projects-container').remove();
Turbolinks.visit($(this).data('url')) Turbolinks.visit($(this).data('url'));
}); });
} }

11
app/assets/stylesheets/shared/content_pane.scss
View file

@ -25,13 +25,6 @@
.caret { .caret {
margin: 8px 0 8px 8px; margin: 8px 0 8px 8px;
} }
&.sort-switch {
.caret {
margin: unset;
}
}
&.open { &.open {
.caret { .caret {
transform: rotateX(180deg) transform: rotateX(180deg)
@ -55,10 +48,6 @@
background: $color-concrete; background: $color-concrete;
} }
} }
&.sort-projects-menu {
min-width: 140px;
}
} }
} }
} }

4
app/helpers/projects_helper.rb
View file

@ -26,9 +26,9 @@ module ProjectsHelper
when 'ztoa' when 'ztoa'
records.sort_by { |c| c.name.downcase }.reverse! records.sort_by { |c| c.name.downcase }.reverse!
when 'arch_old' when 'arch_old'
records.sort_by { |c| [c.class.to_s, c.archived_on] } records.sort_by(&:archived_on)
when 'arch_new' when 'arch_new'
records.sort_by { |c| [c.class.to_s, -c.archived_on.to_i] } records.sort_by(&:archived_on).reverse!
end end
folders_recursive_builder(nil, records) folders_recursive_builder(nil, records)
end end

6
app/models/project_folder.rb
View file

@ -90,12 +90,6 @@ class ProjectFolder < ApplicationRecord
end.flatten end.flatten
end end
# projects_overview_service.rb needs archived_on for sorting. ProjectFolder does not have archived_on,
# we will use created_at instead.
def archived_on
created_at
end
private private
def inherit_team_from_parent_folder def inherit_team_from_parent_folder

4
app/services/projects_overview_service.rb
View file

@ -188,9 +188,9 @@ class ProjectsOverviewService
when 'ztoa' when 'ztoa'
records.sort_by { |c| c.name.downcase }.reverse! records.sort_by { |c| c.name.downcase }.reverse!
when 'arch_old' when 'arch_old'
records.sort_by { |c| [c.class.to_s, c.archived_on] } records.sort_by(&:archived_on)
when 'arch_new' when 'arch_new'
records.sort_by { |c| [c.class.to_s, -c.archived_on.to_i] } records.sort_by(&:archived_on).reverse!
end end
end end
end end