infopark_fiona7 1.1.0.0.7 → 1.1.0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d337ceef900e8141bcba2e73b9b26ddd4d4b7d1
-  data.tar.gz: d0984a4ead03ef0b2bbe0b2c9f7c09440ae2c17b
+  metadata.gz: 1b1721ccc0094e620227cfcaaa3018f3a68f05ff
+  data.tar.gz: f9654b4d638b1bddc8870fd911b4486f3c86744b
 SHA512:
-  metadata.gz: 2fdb619d30af11800806d00f07cf7925b7968317b75c5347b6981d95d40442b9a57c8b08391baf139f28231fd9eec9f5616a95033a3fe5a7e9553c51bddce2c9
-  data.tar.gz: bf328e8a7a6a3109331b09c72fb560fbe2ff4a2b42ce0cd05bcaf0b0253b8e334a85163336e136d96bf8a33b96504c4aa4f70fc16ef1df308f4a0a8101a1cb67
+  metadata.gz: 60c6057940a7654f8eab6decb210d675399d475c9767c1176a3ab515740f235014f357d402c5c04e664e47129afe0c83b74cdf5e98dbee36a5873e94e4017157
+  data.tar.gz: 5126808e7e797251d3aada4a52c3b1930f6962c351c79ebc0565f38707a43c86e9dbee47c7136dade0b2a8786fecd0e18dd3635129396c5cc416f962ad18e1b8

data/app/helpers/fiona7_override_helper.rb

@@ -27,11 +27,11 @@ module Fiona7OverrideHelper
     scrivito_body_tags
   end
 
-  def fiona7_tag(tag_name, obj_or_widget, field_name, html_options = {}, &block)
+  def fiona7_tag(tag_name, obj_or_widget, field_name, html_options = {}, editing_options = {}, &block)
     raise "This method can only be used in legacy mode" unless Fiona7.mode == :legacy
 
     obj_or_widget = obj_or_widget.kind_of?(RailsConnector::BasicObj) ? obj_or_widget.scrivito_obj : obj_or_widget
-    scrivito_tag(tag_name, obj_or_widget, field_name, html_options, &block)
+    scrivito_tag(tag_name, obj_or_widget, field_name, html_options, editing_options = {}, &block)
   end
   
   def fiona7_tag_list(tag_name, obj, field_name, options = {}, &block)

data/app/models/fiona7/write_obj.rb

@@ -26,6 +26,10 @@ module Fiona7
     has_many :children, :class_name => 'RailsConnector::AbstractObj', :foreign_key => 'parent_obj_id'
     belongs_to :parent, :class_name => 'RailsConnector::AbstractObj', :foreign_key => 'parent_obj_id'
 
+    def self.table_name
+      @table_name || self.base_class.table_name
+    end
+
     # disable STI
     if Fiona7.mode == :standalone
       # In standalone mode Obj belongs to scrivito

data/infopark_fiona7.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |s|
   s.add_dependency "infopark_fiona_connector", "= 7.0.1.beta2"
   s.add_dependency "infopark_reactor", ">= 1.18.0"
   s.add_dependency "mini_magick"
-  s.add_development_dependency "ruby-prof"
+  #s.add_development_dependency "ruby-prof"
 end

data/lib/fiona7/fiona_connector_patches/basic_obj.rb

@@ -32,7 +32,12 @@ module RailsConnector
     end
 
     def self.compute_type(type_name)
-      try_type { type_name.constantize } || RailsConnector::BasicObj
+      if Fiona7.mode == :standalone
+        fallback_class = self
+      else
+        fallback_class = ::Obj
+      end
+      try_type { type_name.constantize } || fallback_class
     end
 
 

data/lib/fiona7/middleware/table_switching_middleware.rb

@@ -14,7 +14,7 @@ module Fiona7
           use_preview = editing_context.authenticated_editor? && selected_workspace_id(editing_context) == 'rtc'
 
           TableSwitcher.new(
-            Fiona7::WriteObj,
+            Fiona7::WriteObj.base_class,
             use_preview ? "preview_objs" : "objs"
           ).switch
         end

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "1.1.0.0.7"
+  VERSION = "1.1.0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 1.1.0.0.7
+  version: 1.1.0.0.8
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-prof
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: scrivito-compatible interface for classic Fiona
 email:
 - tomasz.przedmojski@infopark.de
@@ -274,9 +260,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: scrivito-compatible interface for classic Fiona
 test_files: []
-has_rdoc: