infopark_fiona7 1.5.5.4.1 → 1.5.5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 680cc8e643912cbbf98dc96eb8efd1d66cec19a3
-  data.tar.gz: d56bd4c52dad56d36e435679a40a5826198ebb75
+  metadata.gz: cf226dd1d9eefb04c31a6a9d43f8d613578af159
+  data.tar.gz: 9be472d5297f419fc0ce2d9ef605b09aaa48552b
 SHA512:
-  metadata.gz: 219685c11a611e89cdd60c49643b57050b06c8d3aedaa5903b4766fa0b555440d8ecf4fec0ce58b62c1d206859d6541e6a2d47db646f556100f18e3a21ff22e7
-  data.tar.gz: a9a75d826d516430bd09e4dae365bc8221c77cdd48141797ac53b61fad6a707af19fecfc17981489ceaf2865d60a23ab4b0d7c5d2674dac7cf2c83ff20447f50
+  metadata.gz: 5dd1d35a27b86f3601923ab62bf38c0bccfbde1cef1d1cb9480369de2482ac8c062e5017d908c413b79c1011a7dd508dddee9a20c3c3870c1e344df80dcbd73a
+  data.tar.gz: 25968a661a3f890cd643ab186cb6e29bc04facb8dab7a7c183c4525d573453ae26d2745acbe08158a8360ac58775330034273bc92065b55c2a21dfb45d2bbf03

data/app/controllers/fiona7/tasks_controller.rb

@@ -4,16 +4,16 @@ module Fiona7
   class TasksController < ActionController::Base
     def index
       @details_view = self.details_view_lambda
-      @tasks = Fiona7::Tasks::Loader.new(self.user_name).call
+      @tasks = Fiona7::Tasks::Loader.new(self.user_name, self.groups).call
     end
 
     protected
     def user_name
-      if params[:mode] == 'user'
-        rsession.user_name
-      else
-        nil
-      end
+      rsession.user_name
+    end
+
+    def groups
+      rsession.user.groups unless params[:mode] == 'user'
     end
 
 

data/lib/fiona7/builder/obj_builder.rb

@@ -212,13 +212,23 @@ module Fiona7
         full_text = ::YAML.load(@obj.attr_values["X_full_text"]) rescue {}
         full_text = {} unless full_text.kind_of?(Hash)
         full_text["_widget_pool"] ||= {}
-        full_text["_widget_pool"].deep_merge!(@widget_pool)
+        full_text["_widget_pool"].deep_merge!(filtered_widget_pool)
         full_text.to_yaml
       rescue => e
         Rails.logger.error("Unable to store information for search engine: #{e.message}")
         nil
       end
 
+      def filtered_widget_pool
+        (@widget_pool || {}).deep_dup.tap do |filtered|
+          filtered.each do |k, values|
+            if values.kind_of?(Hash)
+              values.delete_if {|k, v| !(v.respond_to?(:first) && ["string", "enum", "stringlist", "text", "html", "multienum"].include?(v.first)) }
+            end
+          end
+        end.as_json
+      end
+
       def name_and_parent_path_from_path(path)
         components = path.split('/')
         name       = components.pop.presence

data/lib/fiona7/tasks/loader.rb

@@ -4,13 +4,14 @@ require 'fiona7/tasks/task'
 module Fiona7
   module Tasks
     class Loader
-      def initialize(user_name=nil, forbidden_classes=Fiona7::ForbiddenObjClasses.new.call)
+      def initialize(user_name=nil, groups=nil, forbidden_classes=Fiona7::ForbiddenObjClasses.new.call)
         self.user_name         = user_name
+        self.groups            = groups
         self.forbidden_classes = forbidden_classes
       end
 
       def call
-        raw_tasks = RailsConnector::Task.where(self.user_login_condition).joins(
+        raw_tasks = self.tasks_query.joins(
           "INNER JOIN #{Fiona7::EditedObj.table_name} objs ON objs.obj_id = #{RailsConnector::Task.table_name}.obj_id"
         ).where(
           "objs.obj_class NOT IN (?)", self.forbidden_classes
@@ -41,12 +42,14 @@ module Fiona7
       end
 
       protected
-      attr_accessor :user_name, :forbidden_classes
-      def user_login_condition
-        if self.user_name
-          {user_login: self.user_name}
+      attr_accessor :user_name, :groups, :forbidden_classes
+      def tasks_query
+        if self.user_name.present? && self.groups.present?
+          RailsConnector::Task.where(
+            "user_login = ? OR group_name IN (?)", self.user_name, self.groups
+          )
         else
-          {}
+          RailsConnector::Task.where(user_login: self.user_name)
         end
       end
     end

data/lib/fiona7/tasks/task.rb

@@ -1,6 +1,9 @@
 module Fiona7
   module Tasks
     class Task < Struct.new(:id, :obj, :type, :title, :user_login, :group_name, :timestamp, :comment)
+      def obj_id
+        self.obj.try(:id)
+      end
     end
   end
 end

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "1.5.5.4.1"
+  VERSION = "1.5.5.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 1.5.5.4.1
+  version: 1.5.5.5.0
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails