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

hound

Browse source
This commit is contained in:
zmagod 2017-01-25 15:40:35 +01:00
parent 1220466035
commit a507bb4d1f
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/datatables/sample_datatable.rb
View file

@ -296,10 +296,10 @@ class SampleDatatable < AjaxDatatablesRails::Base
# grabs the ids that are not the previous one but are still of the same team
unassigned = Sample
.where('"samples"."team_id" = ?', @team.id)
.where('"samples"."id" NOT IN (?)', assigned)
.select('"samples"."id"')
.distinct
.where('"samples"."team_id" = ?', @team.id)
.where('"samples"."id" NOT IN (?)', assigned)
.select('"samples"."id"')
.distinct
# check the input param and merge the two arrays of ids
if params[:order].values[0]["dir"] == "asc"
@ -321,12 +321,15 @@ class SampleDatatable < AjaxDatatablesRails::Base
# Rails apparently forgets to join stuff in subqueries -
# #justrailsthings
conditions = build_conditions_for(params[:search][:value])
filter_query = 'SELECT "samples"."id" FROM "samples"
LEFT OUTER JOIN "sample_custom_fields" ON "sample_custom_fields"."sample_id" = "samples"."id"
LEFT OUTER JOIN "sample_types" ON "sample_types"."id" = "samples"."sample_type_id"
LEFT OUTER JOIN "sample_groups" ON "sample_groups"."id" = "samples"."sample_group_id"
LEFT OUTER JOIN "users" ON "users"."id" = "samples"."user_id"
WHERE "samples"."team_id" = ' + @team.id.to_s + ' AND ' + conditions.to_sql
filter_query = %(SELECT "samples"."id" FROM "samples"
LEFT OUTER JOIN "sample_custom_fields" ON
"sample_custom_fields"."sample_id" = "samples"."id"
LEFT OUTER JOIN "sample_types" ON
"sample_types"."id" = "samples"."sample_type_id"
LEFT OUTER JOIN "sample_groups"
ON "sample_groups"."id" = "samples"."sample_group_id"
LEFT OUTER JOIN "users" ON "users"."id" = "samples"."user_id"
WHERE "samples"."team_id" = #{@team.id} AND #{conditions.to_sql})
records = records.where("samples.id IN (#{filter_query})")
end

7
app/helpers/application_helper.rb
View file

@ -138,9 +138,10 @@ module ApplicationHelper
team &&
UserTeam.user_in_team(user, team).any?
user_t, = user
.user_teams
.where('user_teams.team_id = ?',
team).first
.user_teams
.where('user_teams.team_id = ?', team)
.first
user_description = %(<div class='col-xs-4'>
<img src='#{avatar_path(user, :thumb)}' alt='thumb'>
</div><div class='col-xs-8'>