optimacms 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40ffe286ec9f760db4b9ea7ebb55e672c283c2a5
-  data.tar.gz: 11fb4168ed4c9edc704c8caa1a3d44eefe700f51
+  metadata.gz: d56d19bc1d5b1acea7385068c046c50434566ea9
+  data.tar.gz: e4c86a423d130de510ffccdfb681e0ecdd8b1acc
 SHA512:
-  metadata.gz: 69af8da4f41fee3d65d8117fc70ee943783382c4e5c0a5e66786d9f97250378086b641ade84f10c3dbf0020774230744cd788891bff1f4e281d0631222260ef5
-  data.tar.gz: c17ed4122b21acf0120a9072245b6080842b763a760ff00a7f82f7dfa0fecb4131641e82553632d1d7db1266fb859eab56d4a3f06958726035f5537a4fda4a7a
+  metadata.gz: 4e809d5e46ab7e56b2ef27474ed57806ac6d6638188e6e14c06ad498ae161bb9e3e5565c66a75cc315f84239c3682852c6c6e59bed99937bb1772df696eeb8f0
+  data.tar.gz: fc2107c17dc08bebc82cc0ecd451051e71e77cac3413d11067a83ee6ab901bacce122c065e0a5a3c6f9c00385d0ec36eb905b6ca1a4a1829c85a0aae0de21e32

data/app/controllers/optimacms/admin/pages_controller.rb

@@ -27,6 +27,7 @@ module Optimacms
     end
 
 
+
     search_filter :index, {save_session: true, search_method: :post_and_redirect, url: :pages_url, search_url: :search_pages_url} do
       default_order "created_at", 'desc'
 
@@ -235,9 +236,6 @@ module Optimacms
         :page
       end
 
-      def url_list
-        pages_url
-      end
 
       # Use callbacks to share common setup or constraints between actions.
       def set_item

data/app/controllers/optimacms/pages_controller.rb

@@ -83,6 +83,11 @@ module Optimacms
         my_set_render_template @pagedata.template_path, @pagedata.layout.basename
         my_set_meta @pagedata.meta
 
+        # callbacks from main app
+        if respond_to?(:before_page_render)
+          send(:before_page_render)
+        end
+
         render @optimacms_tpl, :layout=>@optimacms_layout
         #render :text => @content, :layout => @page.layout.name
         return

data/lib/optimacms/page_services/page_data.rb

@@ -24,6 +24,8 @@ module Optimacms
       end
 
       def lang
+        return @lang unless @lang.nil?
+
         # TODO: calc lang
 
         # from url

data/lib/optimacms/version.rb

@@ -1,3 +1,3 @@
 module Optimacms
-  VERSION = "0.2.11"
+  VERSION = "0.2.12"
 end

data/spec/dummy/log/development.log

@@ -39655,3 +39655,61 @@ Processing by Optimacms::Admin::TemplatesController#edit as HTML
   Rendered W:/myrails/cms/site/app/views/optimacms/admin/layouts/application.html.haml (512.0ms)
   Rendered W:/myrails/cms/site/app/views/optimacms/admin/layouts/basic.html.haml (1087.1ms)
 Completed 200 OK in 1885ms (Views: 1770.6ms | ActiveRecord: 19.0ms)
+
+
+Started GET "/admin/pages/163/edit" for 127.0.0.1 at 2016-06-06 22:56:09 +0300
+Processing by Optimacms::Admin::PagesController#edit as HTML
+  Parameters: {"id"=>"163"}
+  Optimacms::CmsAdminUser Load (1.0ms)  SELECT  `cms_users`.* FROM `cms_users` WHERE `cms_users`.`id` = 4  ORDER BY `cms_users`.`id` ASC LIMIT 1
+  Optimacms::Language Load (1.0ms)  SELECT `cms_languages`.* FROM `cms_languages`
+  Optimacms::Page Load (1.0ms)  SELECT  `cms_pages`.* FROM `cms_pages` WHERE `cms_pages`.`id` = 163 LIMIT 1
+  Optimacms::Language Load (0.0ms)  SELECT `cms_languages`.* FROM `cms_languages` WHERE (1=1)  ORDER BY pos asc
+  CACHE (0.0ms)  SELECT `cms_languages`.* FROM `cms_languages` WHERE (1=1)  ORDER BY pos asc
+  Optimacms::PageTranslation Load (0.0ms)  SELECT `cms_pages_translation`.* FROM `cms_pages_translation` WHERE `cms_pages_translation`.`item_id` = 163
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_form_errors.html.haml (0.0ms)
+  Optimacms::Page Load (1.0ms)  SELECT  `cms_pages`.* FROM `cms_pages` WHERE `cms_pages`.`id` = 24 LIMIT 1
+  Optimacms::Template Load (1.0ms)  SELECT `cms_templates`.* FROM `cms_templates` WHERE `cms_templates`.`is_folder` = 0 AND `cms_templates`.`type_id` = 1
+  Optimacms::Template Load (0.0ms)  SELECT  `cms_templates`.* FROM `cms_templates` WHERE `cms_templates`.`id` = 156 LIMIT 1
+  CACHE (0.0ms)  SELECT `cms_pages_translation`.* FROM `cms_pages_translation` WHERE `cms_pages_translation`.`item_id` = 163  [["item_id", 163]]
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/pages/_meta.html.haml (96.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/common/_modal_div.html.haml (0.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/templates/_js_form_modal.html.haml (68.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/common/_js_tinymce.html.haml (61.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/pages/_form.html.haml (544.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/pages/edit.html.haml within optimacms/admin/layouts/main (596.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_top.html.haml (2.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_leftmenu.html.haml (48.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_breadcrumbs.html.haml (0.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_flash.html.haml (1.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_version.html.haml (1.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_footer.html.haml (43.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/layouts/application.html.haml (378.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/layouts/basic.html.haml (756.0ms)
+Completed 200 OK in 1749ms (Views: 1530.0ms | ActiveRecord: 5.0ms)
+
+
+Started GET "/assets/optimacms/admin.self-84e36b0189cfc4ac18c624ad198afcefbbd618cce7a3809360431d6d8b6fd71c.css?body=1" for 127.0.0.1 at 2016-06-06 22:56:13 +0300
+
+
+Started GET "/assets/optimacms/admin_tpl.self-3552518fc3641d7e2cce03ff12090a8288cfdabbeb2263909a89f56757898dfd.css?body=1" for 127.0.0.1 at 2016-06-06 22:56:13 +0300
+
+
+Started GET "/assets/optimacms/application.self-fb28094035fc8f155b896e47c199355db7c84fc9d6214ed9800f1022ac2ece52.js?body=1" for 127.0.0.1 at 2016-06-06 22:56:13 +0300
+
+
+Started GET "/assets/jquery2.self-a4777c1acac0a74340755725342901a54ed000955bf6f5320491b8b2514c86ec.js?body=1" for 127.0.0.1 at 2016-06-06 22:56:13 +0300
+
+
+Started GET "/assets/jquery_ujs.self-d456baa54c1fa6be2ec3711f0a72ddf7a5b2f34a6b4f515f33767d6207b7d4b3.js?body=1" for 127.0.0.1 at 2016-06-06 22:56:13 +0300
+
+
+Started GET "/assets/bootstrap.self-d0e973a52d36a01036265aeefaf2d1ae3499d2cb231a9be3bd846432daf231de.js?body=1" for 127.0.0.1 at 2016-06-06 22:56:14 +0300
+
+
+Started GET "/assets/bootstrap3-autocomplete-input.min.self-ce3ca04e5eed6a1c7c2a10589a176cee121808f99dd9b917dd3bf62ce710f211.js?body=1" for 127.0.0.1 at 2016-06-06 22:56:14 +0300
+
+
+Started GET "/assets/bootstrap3-typeahead.min.self-78fcb50a4b38a41b52a51f8662133e39712218bbacbb337469c3ed64bb88ae9d.js?body=1" for 127.0.0.1 at 2016-06-06 22:56:14 +0300
+
+
+Started GET "/assets/optimacms/admin.self-7c370d9536d7d0d6a0f7cd7f9826692acd93e4fb05ba46f7b630b879740343d3.js?body=1" for 127.0.0.1 at 2016-06-06 22:56:14 +0300

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: optimacms
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Max Ivak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-05 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -3168,7 +3168,6 @@ files:
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/zO/zOYiSe2afDhX-1LYIwuCWapltkxGWAUk0FHL8Cwjqa8.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/zOYiSe2afDhX-1LYIwuCWapltkxGWAUk0FHL8Cwjqa8.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/zZ/zZIEsvImSmJgM6U7J7ax-T8hb5Pgwjpg8z_uigXo0Ew.cache
-- spec/dummy/tmp/pids/server.pid
 - spec/factories/page.rb
 - spec/models/page_route_service_spec.rb
 - spec/models/page_spec.rb
@@ -5929,7 +5928,6 @@ test_files:
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/_7/_7FQINbPSTR-v7mkQqmlJGbmQnvnwF0RrmhXMPrOXEE.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/_7FQINbPSTR-v7mkQqmlJGbmQnvnwF0RrmhXMPrOXEE.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/_plqrhIq8C51ojWLP-nhWJFozobLliuC84o1T4S4gTo.cache
-- spec/dummy/tmp/pids/server.pid
 - spec/factories/page.rb
 - spec/models/page_route_service_spec.rb
 - spec/models/page_spec.rb

data/spec/dummy/tmp/pids/server.pid

@@ -1 +0,0 @@
-3144