subj_sub_models 0.0.3.26 → 0.0.3.27

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: fce6ce8300b955f3b964930c019699991c4588a0
4
- data.tar.gz: aae15f23a478110ab92354cde71d289635fae7eb
3
+ metadata.gz: 87178a87b9092bde0c17330775f657dd9d206909
4
+ data.tar.gz: f73edced2a442469abe4a1816e49dbd0b50c1769
5
5
  SHA512:
6
- metadata.gz: 0416e17adecd52ced25e337312ab5d38b25e805784009906bda82d4ef82b2cb5364c4e10010a95e0c42a2d9d35252605da3c6b05a51e13fbdc43fd2d6aab0a8c
7
- data.tar.gz: 21a2419b12c711fb29ae1d7810e45e45cdcb35df81eed1143e654504adabbab74e97565531737951b5803147f871a4dc3f2bec60ef2bfb8ddb4977a1d0812090
6
+ metadata.gz: 9370e5d7a6716af2048a23e01e9658d13c4c6adaf76f85357bd04b665258f08b5883f238d4a192c8fcb0f9eedd0fcce5e4eea1b70ee00894e49c5864f77a14d2
7
+ data.tar.gz: 887cb891bb6f32fe3e7854bab4110c066d4f66403e59f4447ae1c4fca996188e8a58f1638a0ca6e952d1c63ea9db39fa4c8f33366461b8d264401e4dbf5c077f
@@ -51,7 +51,10 @@ module SubjModels
51
51
 
52
52
  scope :is_available, -> (params) do
53
53
  return all unless params.first == 'true'
54
- ids = (user = User.find_by(id: params.second.to_i)) ? user.available_nomenclature_ids : []
54
+ user = User.find_by(id: params.second.to_i)
55
+ nomenclatures_available_for_user = Nomenclature.joins({access_groups: [user_specializations: :users]}, :attribute_values).where("users.id = ?", user.id)
56
+ nomenclatures_with_b2c_prices = Nomenclature.joins(:nomenclature_prices, :attribute_values).where('nomenclature_prices.price_type = ?', NomenclaturePrice.price_types['b2c'] )
57
+ ids = Nomenclature.union([nomenclatures_available_for_user, nomenclatures_with_b2c_prices], distinct: true).map(&:id)
55
58
  where(id: ids)
56
59
  end
57
60
 
@@ -125,7 +125,7 @@ module SubjModels
125
125
  end
126
126
 
127
127
  def available_nomenclature_ids
128
- nomenclatures_available_for_user = Nomenclature.joins(access_groups: [user_specializations: :users]).where("users.id" => self.id)
128
+ nomenclatures_available_for_user = Nomenclature.joins(access_groups: [user_specializations: :users]).where("users.id = ?", self.id)
129
129
  nomenclatures_with_b2c_prices = Nomenclature.joins(:nomenclature_prices).where('nomenclature_prices.price_type = ?', NomenclaturePrice.price_types['b2c'] )
130
130
  Nomenclature.union([nomenclatures_available_for_user, nomenclatures_with_b2c_prices], distinct: true).map(&:id)
131
131
  end
@@ -1,3 +1,3 @@
1
1
  module SubjModels
2
- VERSION = '0.0.3.26'
2
+ VERSION = '0.0.3.27'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: subj_sub_models
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.3.26
4
+ version: 0.0.3.27
5
5
  platform: ruby
6
6
  authors:
7
7
  - A.Nasa
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-11-19 00:00:00.000000000 Z
11
+ date: 2017-11-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler