scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-12-09 13:46:21 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix team selection in global activities and add link from navbar

Browse source
This commit is contained in:
Anton Ignatov 2019-03-20 10:33:22 +01:00
parent 51f6644c16
commit 29b67be127
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/global_activities_controller.rb
View file

@ -3,8 +3,8 @@
class GlobalActivitiesController < ApplicationController class GlobalActivitiesController < ApplicationController
def index def index
teams = activity_filters[:teams] teams = activity_filters[:teams]
teams = current_user.teams if teams.blank? @teams = current_user.teams
@teams = teams teams = @teams.pluck(:id) if teams.blank?
@activity_types = Activity.activity_types_list @activity_types = Activity.activity_types_list
@user_list = User.where(id: UserTeam.where(team: current_user.teams).select(:user_id)) @user_list = User.where(id: UserTeam.where(team: current_user.teams).select(:user_id))
.distinct .distinct

1
app/services/activities_service.rb
View file

@ -4,7 +4,6 @@ class ActivitiesService
def self.load_activities(user, teams, filters = {}) def self.load_activities(user, teams, filters = {})
# Create condition for view permissions checking first # Create condition for view permissions checking first
visible_projects = Project.viewable_by_user(user, teams) visible_projects = Project.viewable_by_user(user, teams)
query = Activity.where('project_id IS NULL AND team_id IN (?)', teams) query = Activity.where('project_id IS NULL AND team_id IN (?)', teams)
.or(Activity.where(project: visible_projects)) .or(Activity.where(project: visible_projects))

2
app/views/shared/_left_menu_bar.html.erb
View file

@ -56,7 +56,7 @@
</ul> </ul>
<ul class="nav nav-bottom"> <ul class="nav nav-bottom">
<li class="<%= "active" if activities_are_selected? %>"> <li class="<%= "active" if activities_are_selected? %>">
<%= link_to activities_path, id: "activities-link", title: t('left_menu_bar.activities') do %> <%= link_to global_activities_path, id: "activities-link", title: t('left_menu_bar.activities') do %>
<span class="fas fa-list"></span> <span class="fas fa-list"></span>
<span><%= t('left_menu_bar.activities') %></span> <span><%= t('left_menu_bar.activities') %></span>
<% end %> <% end %>