infopark_fiona7 1.1.0.0.6 → 1.1.0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ea7c26aef3bb431180a3d54edee505f4f2bbbd1
-  data.tar.gz: f444f6d349dff96812144c0278a6a5f956c8e168
+  metadata.gz: 0d337ceef900e8141bcba2e73b9b26ddd4d4b7d1
+  data.tar.gz: d0984a4ead03ef0b2bbe0b2c9f7c09440ae2c17b
 SHA512:
-  metadata.gz: be3bca118713864ff4767e9b53d4dc503b331accc5621edee24435ed288dc848433ea0d743a8a17c462520f9bce1d1e05ad5697106c09f00f9858fabaf992b9a
-  data.tar.gz: 9603d0a7be4e62d0dd84609ff31a415844ed0082db57045d84c6260d88741a8739542d6d68350c9360a39da851bd6896edf104b62949efad9c65891a560bc611
+  metadata.gz: 2fdb619d30af11800806d00f07cf7925b7968317b75c5347b6981d95d40442b9a57c8b08391baf139f28231fd9eec9f5616a95033a3fe5a7e9553c51bddce2c9
+  data.tar.gz: bf328e8a7a6a3109331b09c72fb560fbe2ff4a2b42ce0cd05bcaf0b0253b8e334a85163336e136d96bf8a33b96504c4aa4f70fc16ef1df308f4a0a8101a1cb67

data/app/assets/javascripts/scrivito_patches/models/obj.js

@@ -197,6 +197,12 @@
       },
 
       fetch_page_class_selection: function(params) {
+        if (!params || params === {}) {
+          var current_page = scrivito.application_document().page();
+          var path = (typeof current_page.provided_path === 'function') && current_page.provided_path();
+          params = {};
+          params['_path'] = path;
+        }
         return scrivito.obj.fetch_class_selection('objs/page_class_selection', params);
       },
 

data/app/controllers/fiona7/sessions_controller.rb

@@ -30,7 +30,7 @@ module Fiona7
 
     def true_root_path
       if Fiona7.mode == :standalone
-        scrivito_root_path
+        '/'
       elsif Fiona7.mode == :legacy
         root_path
       else

data/lib/fiona7/controllers/rest_api/obj_controller.rb

@@ -202,7 +202,7 @@ module Fiona7
             end
           end
           if outside_objects.length != 0
-            outsize_paths = outsize_objects.map(&:path).join(" ")
+            outside_paths = outside_objects.map(&:path).join(" ")
             Assert.input(
               false,
               "Cannot remove object because #{outside_paths} have links pointing to it"

data/lib/fiona7/fiona_connector_patches/basic_obj.rb

@@ -31,6 +31,10 @@ module RailsConnector
       ShadowClasses.const_get(self.name, false)
     end
 
+    def self.compute_type(type_name)
+      try_type { type_name.constantize } || RailsConnector::BasicObj
+    end
+
 
     class << self
 

data/lib/fiona7/scrivito_patches/cms_routing.rb

@@ -30,6 +30,26 @@ module Scrivito
       end
     end
 
+    # patch for handling direct descendants of Scrivito::BasicObj
+    def path_or_url_without_editing_context(target, path_or_url, options)
+      if target.is_a?(Link)
+        path_or_url_for_links(target, path_or_url, options)
+      elsif target.is_a?(::Scrivito::BasicObj)
+        path_or_url_for_objs(target, path_or_url, options)
+      elsif target.respond_to?(:first)
+        if target.first.is_a?(Link)
+          path_or_url_for_links(target.first, path_or_url, options)
+        else
+          return LINK_TO_EMPTY_LINKLIST
+        end
+      elsif target.is_a?(Binary)
+        binary_url(target)
+      else
+        raise "scrivito_path or scrivito_url was called with an instance of #{target.class}. "+
+          "It must only be called with an Obj or a Link or a non-empty LinkList."
+      end
+    end
+
     # Use fiona connector permalinks in legacy mode
     def path_or_url_for_objs(obj, path_or_url, options)
       permalink = obj.permalink

data/lib/fiona7/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 1.1.0.0.6
+  version: 1.1.0.0.7
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails