check generate page url, add new type for template element

@@ -105,6 +105,8 @@ module Kanjai
     def show_editor
       prepare_edit_content
 
+      get_page_list(@page.domain)
+
       render :layout => false
     end
 

@@ -74,21 +74,19 @@ module Kanjai
 
       #@page_data = PageDatum.where(:url => @url).first
       #$current_locale = PageLang.where(default_use: true).first.code
-      @page_data = PageDatum.joins(page: :domain).where(kanjai_domains: {id: domain.id}).where(:url => @url, lang: I18n.locale).first
-      session[:current_locale] = I18n.locale
-      if @page_data.nil?
-        mas = @url.split('/')
-        if mas.length > 1
-          @url = '/' + mas[1] + '/:path'
-          @page_data = PageDatum.joins(page: :domain).where(kanjai_domains: {id: domain.id}).where(:url => @url, lang: I18n.locale).first
-        end
-      end
+      @page_data = Kanjai::CurrentPage.new(domain: domain, lang: I18n.locale, url: @url).call
 
+      session[:current_locale] = I18n.locale
+      #if @page_data.nil?
+      #  mas = @url.split('/')
+      #  if mas.length > 1
+      #    @url = '/' + mas[1] + '/:path'
+      #    @page_data = PageDatum.joins(page: :domain).where(kanjai_domains: {id: domain.id}).where(:url => @url, lang: I18n.locale).first
+      #  end
+      #end
 
-      if @page_data
-        #$current_locale = @page_data.lang
-      else
-        if @url == '/'
+      if @page_data.nil?
+        if @url == '/' || @url == ''
           root_page = Page.joins(:domain).where(kanjai_domains: {id: domain.id}).where(root_page: true).first
           if root_page
             redirect_to root_page.menu_url(session[:scheme])

@@ -55,17 +55,38 @@ module Kanjai
 
       if /(http|https):\/\//.match url
         url
+      elsif url[0] == '/'
+        url  == '/' ? "/#{lang}" : "/#{lang}#{url}"
+      else
+        current_page = self
+        segments = []
+        loop do
+          current_page_url = current_page.lang_attributes(lang, :url)
+          segments << current_page_url.gsub(/^\//, '').gsub(/\/$/, '')
+          break if current_page_url[0] == '/'
+          break if current_page.parent.nil?
+          current_page = current_page.parent
+        end
+
+        url = segments.reverse.join('/')
+        url = "/#{url}" unless url[0] == '/'
+        "/#{lang}#{url}"
+      end
+    end
+
+    def generate_url_old(scheme, url, lang)
+      lang = I18n.locale.to_s if lang.nil?
+
+      if /(http|https):\/\//.match url
+        url
       else
         if /\//.match url
           if url  == '/'
-            #scheme + ADMIN_CONFIG['domain_name'] + '/' +  lang
             '/' +  lang
           else
-            #scheme + ADMIN_CONFIG['domain_name'] + '/' +  lang + url
             '/' +  lang + url
           end
         else
-          #scheme + ADMIN_CONFIG['domain_name'] + '/' +  lang + '/' + url
           '/' +  lang + '/' + url
         end
       end

@@ -187,7 +187,7 @@ module Kanjai
         page_template = self.page.page_template
         subpart = page_template.template_parts.find_by_code(self.type_content)
         if subpart
-          html = Kanjai::TemplateGenerator.subpart_generate(session, 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(subpart), self.id)
         else
           html = ''
         end
@@ -201,11 +201,19 @@ module Kanjai
     end
 
 
-    def marker_hash
+    def marker_hash(subpart)
       result = {}
       self.page_content_markers.order(:row_item).each do |item|
         result[item.row_item] ||= {}
-        result[item.row_item][item.marker] = item.text_value
+        element = subpart.field_options.find{|element| element[:name] ==  item.marker}
+        marker_value = item.text_value 
+        if element && element[:attributes] && element[:attributes]['type'] == 'page'
+          page = Kanjai::Page.find_by(id: marker_value)
+          if page
+            marker_value = page.menu_url('https://')
+          end
+        end
+        result[item.row_item][item.marker] = marker_value
       end
       result
     end

@@ -55,6 +55,10 @@
               </div>
             <% end %>
 
+            <% if form2.object.get_marker_type(@type_content) == 'page' %>
+              <%= form2.select :text_value, @pages.collect{|p|  ["-" * p[:level]*2 +  p[:title], p[:id], :style => "padding-left:#{p[:level]*10}px;"] }, {:include_blank => true}, :class => "form-control" %>
+            <% end %>            
+
         </div>
 
     <% end %>

+module Kanjai
+	class CurrentPage
+
+		attr_reader :domain, :lang, :url
+
+		def initialize(domain:, lang:, url:)
+			@domain = domain
+			@lang = lang
+			@url = url
+		end
+
+		def call
+			mas = url.split('/').reject { |c| c.empty? }
+			root_page = nil			
+			page_datum = nil
+
+			loop do
+				break if mas.count == 0
+
+				check_length = mas.count
+
+				loop do
+					break if check_length <= 0
+
+					work_url = mas[0...check_length].join('/')
+					work_url = '/' if work_url.to_s.empty?
+					sheck_scope = scope
+					if root_page
+						page_ids = [].tap do |n|
+							root_page.walk_tree do |page, level|
+								n << page.id
+							end
+						end
+						sheck_scope = sheck_scope.where(kanjai_pages: {id: page_ids})
+					end
+
+					page_datum = sheck_scope.find_by(url: work_url)
+					page_datum = sheck_scope.find_by(url: "/#{work_url}") if page_datum.nil?
+					page_datum = sheck_scope.find_by(url: "#{work_url}/") if page_datum.nil?
+					page_datum = sheck_scope.find_by(url: "/#{work_url}/") if page_datum.nil?
+
+					if page_datum
+						root_page = page_datum.page
+						mas = mas.last(mas.count - check_length)
+						break
+					else
+						check_length -= 1
+					end
+				end
+				break if page_datum.nil?
+			end 
+
+			if page_datum.nil? && url == '/'
+				page_datum = scope.find_by(url: url)
+			end
+
+			page_datum
+		end
+
+		private
+
+		def scope
+			@scope ||= PageDatum.joins(page: :domain).where(lang: lang, kanjai_domains: {id: domain.id})
+		end
+
+	end
+end
\ No newline at end of file

 module Kanjai
-  VERSION = "0.0.331"
+  VERSION = "0.0.332"
 end