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

Fix generation of docx report, fix rendering of modals [SCI-8911] (#5831)

Browse source
This commit is contained in:
Alex Kriuchykhin 2023-07-20 16:46:16 +02:00 • committed by GitHub
parent 962400b952
commit 8aa06bf4af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/global_activities_controller.rb
View file

@ -42,11 +42,6 @@ class GlobalActivitiesController < ApplicationController
end end
@activity_types = Activity.activity_types_list @activity_types = Activity.activity_types_list
@user_list = User.where(id: current_user.teams.joins(:users).group('users.id').select('users.id'))
.distinct
.order(full_name: :asc)
.pluck(:full_name, :id)
activities = ActivitiesService.load_activities(current_user, selected_teams, activity_filters) activities = ActivitiesService.load_activities(current_user, selected_teams, activity_filters)
@grouped_activities = activities.group_by do |activity| @grouped_activities = activities.group_by do |activity|

3
app/controllers/my_module_tags_controller.rb
View file

@ -21,7 +21,8 @@ class MyModuleTagsController < ApplicationController
render json: { render json: {
html_module_header: render_to_string( html_module_header: render_to_string(
partial: 'my_modules/tags', partial: 'my_modules/tags',
locals: { my_module: @my_module, editable: can_manage_my_module?(@my_module) } locals: { my_module: @my_module, editable: can_manage_my_module?(@my_module) },
formats: :html
) )
} }
end end

4
app/controllers/my_modules_controller.rb
View file

@ -115,9 +115,7 @@ class MyModulesController < ApplicationController
MyModule: [@my_module.id] MyModule: [@my_module.id]
} }
@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))
.distinct
.pluck(:full_name, :id)
activities = ActivitiesService.load_activities(current_user, current_team, activity_filters) activities = ActivitiesService.load_activities(current_user, current_team, activity_filters)
@grouped_activities = activities.group_by do |activity| @grouped_activities = activities.group_by do |activity|

4
app/controllers/repositories_controller.rb
View file

@ -175,9 +175,7 @@ class RepositoriesController < ApplicationController
def rename_modal def rename_modal
render json: { render json: {
html: render_to_string( html: render_to_string(partial: 'rename_repository_modal', formats: :html)
partial: 'rename_repository_modal'
)
} }
end end

4
app/services/smart_annotations/tag_to_text.rb
View file

@ -43,9 +43,9 @@ module SmartAnnotations
def parse_users_annotations(user, team, text) def parse_users_annotations(user, team, text)
@text = text.gsub(USER_REGEX) do |el| @text = text.gsub(USER_REGEX) do |el|
match = el.match(USER_REGEX) match = el.match(USER_REGEX)
user = User.find_by_id(match[2].base62_decode) user = team.users.find_by(id: match[2].base62_decode)
next unless user next unless user
next if UserTeam.where(user: user, team: team).blank?
user.full_name user.full_name
end end
end end