add language part support

@@ -176,7 +176,7 @@ module Kanjai
       @obj.update(permitted_params[:page_content])
       @obj.update(permitted_params[:page_content])
 
 
       if params[:frontend_part].to_i == 1
       if params[:frontend_part].to_i == 1
-        render :json => {:status => 'ok', :structure_id => @structure_id, frontentd: 1, :html => @obj.get_content_frontend}
+        render :json => {:status => 'ok', :structure_id => @structure_id, frontentd: 1, :html => @obj.get_content_frontend(session) }
       else
       else
         render :json => {:status => 'ok', :structure_id => @structure_id, :html => @obj.get_content}
         render :json => {:status => 'ok', :structure_id => @structure_id, :html => @obj.get_content}
       end
       end
@@ -294,7 +294,7 @@ module Kanjai
 
 
 
 
 
 
-      render :json => {:status => 'ok', :structure_id => @structure_id, :html => @obj.get_content_frontend}
+      render :json => {:status => 'ok', :structure_id => @structure_id, :html => @obj.get_content_frontend(session) }
     end
     end
 
 
     private
     private

@@ -49,7 +49,7 @@ module Kanjai
             end
             end
           end
           end
         else
         else
-          page_content = get_html_by_json_client(@page_data)
+          page_content = get_html_by_json_client(@page_data, session)
           render :html => page_content.html_safe and return
           render :html => page_content.html_safe and return
         end
         end
 
 
@@ -125,7 +125,7 @@ module Kanjai
       markers.each do |marker|
       markers.each do |marker|
         case marker
         case marker
           when '###CONTENT###'
           when '###CONTENT###'
-            page_content = get_html_by_json_client(page_data)
+            page_content = get_html_by_json_client(page_data, session)
             layer.gsub!(marker, page_content)
             layer.gsub!(marker, page_content)
             layer.gsub!('make-checked="false"', '')
             layer.gsub!('make-checked="false"', '')
             layer.gsub!("make-checked='false'", '')
             layer.gsub!("make-checked='false'", '')

@@ -45,7 +45,7 @@ module Kanjai
     end
     end
 
 
 
 
-    def get_html_by_json_client(page_data)
+    def get_html_by_json_client(page_data, session = nil)
       json_data = page_data.template_content
       json_data = page_data.template_content
       html = ''
       html = ''
       #row_template = File.open("#{Rails.root}/app/view/kanjai/pages/templates/row.html.erb").read
       #row_template = File.open("#{Rails.root}/app/view/kanjai/pages/templates/row.html.erb").read
@@ -70,7 +70,7 @@ module Kanjai
               if page_content.type_content.split('-').include?('wrapper')
               if page_content.type_content.split('-').include?('wrapper')
                 html += (page_content.get_simple_content).html_safe
                 html += (page_content.get_simple_content).html_safe
               else
               else
-                cells = page_content.nil? ? '' : page_content.get_content_frontend
+                cells = page_content.nil? ? '' : page_content.get_content_frontend(session)
 
 
                 data_attributes = [
                 data_attributes = [
                     "data-id=#{row['attributes']['id']}",                
                     "data-id=#{row['attributes']['id']}",                
@@ -78,9 +78,6 @@ module Kanjai
                 ]
                 ]
                 html += ApplicationController.render(file: 'kanjai/pages/templates/block', assigns: {content: cells.html_safe, data_attributes: data_attributes.join(' '), row: row}, layout: false).html_safe
                 html += ApplicationController.render(file: 'kanjai/pages/templates/block', assigns: {content: cells.html_safe, data_attributes: data_attributes.join(' '), row: row}, layout: false).html_safe
 
 
-                #html += ActionController::Base.helpers.content_tag(:div, '', html_attributes) do
-                #  ActionController::Base.helpers.concat((page_content.nil? ? '' : page_content.get_content_frontend).html_safe)
-                #end
               end
               end
             end
             end
           end
           end
@@ -92,7 +89,7 @@ module Kanjai
               row["cells"].each do |cell|
               row["cells"].each do |cell|
                 if cell['status'].to_s == 'enabled' || cell['status'].to_s.empty?
                 if cell['status'].to_s == 'enabled' || cell['status'].to_s.empty?
                   page_content = page_data.page_contents.where(:structure_id => cell['id']).first
                   page_content = page_data.page_contents.where(:structure_id => cell['id']).first
-                  html_content = page_content.nil? ? '' : page_content.get_content_frontend
+                  html_content = page_content.nil? ? '' : page_content.get_content_frontend(session)
                   cell_class_name = cell['className']
                   cell_class_name = cell['className']
 
 
                   data_attributes = [
                   data_attributes = [
@@ -121,9 +118,9 @@ module Kanjai
       html.to_s
       html.to_s
     end
     end
 
 
-    def get_html_by_json_client_url(url, locale)
+    def get_html_by_json_client_url(url, locale, session = nil)
       page_data = PageDatum.where(:url => url, lang: locale).first
       page_data = PageDatum.where(:url => url, lang: locale).first
-      get_html_by_json_client(page_data)
+      get_html_by_json_client(page_data, session)
     end
     end
 
 
     def make_navigation(parent_id, level)
     def make_navigation(parent_id, level)

@@ -164,7 +164,7 @@ module Kanjai
       end
       end
     end
     end
 
 
-    def get_content_frontend
+    def get_content_frontend(session = nil)
       if self.type_content == 'rte_editor'
       if self.type_content == 'rte_editor'
         self.text_html.to_s
         self.text_html.to_s
       elsif self.type_content == 'plugin'
       elsif self.type_content == 'plugin'
@@ -180,7 +180,7 @@ module Kanjai
         page_template = self.page.page_template
         page_template = self.page.page_template
         subpart = page_template.template_parts.find_by_code(self.type_content)
         subpart = page_template.template_parts.find_by_code(self.type_content)
         if subpart
         if subpart
-          html = Kanjai::TemplateGenerator.subpart_generate(nil, self.page.domain, page_template, 'content', subpart.elements, self.marker_hash, self.id)
+          html = Kanjai::TemplateGenerator.subpart_generate(session, self.page.domain, page_template, 'content', subpart.elements, self.marker_hash, self.id)
         else
         else
           html = ''
           html = ''
         end
         end

@@ -245,6 +245,11 @@ module Kanjai
 
 
             end
             end
 
 
+          when 'language'
+            code = item[:attributes]['code']
+            if I18n.locale.to_s == code.to_s
+              self.content_generator(session, domain, item[:children], subparts, hash_value)
+            end
           else
           else
             condition_process = true
             condition_process = true
 
 

 module Kanjai
 module Kanjai
-  VERSION = "0.0.279"
+  VERSION = "0.0.280"
 end
 end