add template to domain

@@ -45,7 +45,7 @@ module Kanjai
     private
     private
 
 
     def permitted_params
     def permitted_params
-      params.permit(:domain => [:title, :default_lang_id, :robots, :page_404_id, language_domains_attributes: [:id, :title, :page_lang_id, :_destroy], page_lang_ids: []])
+      params.permit(:domain => [:title, :default_lang_id, :robots, :page_404_id, :template_id, language_domains_attributes: [:id, :title, :page_lang_id, :_destroy], page_lang_ids: []])
     end
     end
 
 
   end
   end

@@ -39,7 +39,11 @@ module Kanjai
           use_cache = false
           use_cache = false
 
 
           if current_admin_user || @page_data.page.private_flag == true || use_cache == false
           if current_admin_user || @page_data.page.private_flag == true || use_cache == false
-            layer = @page_data.page.page_template.get_html_content
+            layer = if @page_data.page.domain.template.present?
+              @page_data.page.domain.template.get_html_content
+            else
+              @page_data.page.page_template.get_html_content
+            end
             content_for_render = setTemplateContent(@page_data.page.domain, @page_data.page.page_template, layer, @page_data)
             content_for_render = setTemplateContent(@page_data.page.domain, @page_data.page.page_template, layer, @page_data)
 
 
             respond_to do |format|
             respond_to do |format|
@@ -49,7 +53,11 @@ module Kanjai
             #render :text => content_for_render and return
             #render :text => content_for_render and return
           else
           else
             if stale?(last_modified: @page_data.last_modified, etag: @page_data.cache_key_with_version)
             if stale?(last_modified: @page_data.last_modified, etag: @page_data.cache_key_with_version)
-              layer = @page_data.page.page_template.get_html_content
+              layer = if @page_data.page.domain.template.present?
+                @page_data.page.domain.template.get_html_content
+              else
+                @page_data.page.page_template.get_html_content
+              end
               content_for_render = setTemplateContent(@page_data.page.domain, @page_data.page.page_template, layer, @page_data)
               content_for_render = setTemplateContent(@page_data.page.domain, @page_data.page.page_template, layer, @page_data)
               respond_to do |format|
               respond_to do |format|
                 format.html{render :plain => content_for_render, status: render_status}
                 format.html{render :plain => content_for_render, status: render_status}

@@ -10,6 +10,7 @@ module Kanjai
     accepts_nested_attributes_for :language_domains, reject_if: :all_blank, allow_destroy: true
     accepts_nested_attributes_for :language_domains, reject_if: :all_blank, allow_destroy: true
 
 
     belongs_to :page_404, class_name: "Kanjai::Page", optional: true
     belongs_to :page_404, class_name: "Kanjai::Page", optional: true
+    belongs_to :template, class_name: "Kanjai::PageTemplate", optional: true
 
 
   end
   end
 end
 end

@@ -41,6 +41,11 @@
     <%= f.select :page_404_id, Kanjai::Page.pages_for_choose(@domain).collect{|p|  ["-" * p[:level]*2 +  p[:title], p[:id]] }, {:include_blank => true}, :class => "form-control" %>
     <%= f.select :page_404_id, Kanjai::Page.pages_for_choose(@domain).collect{|p|  ["-" * p[:level]*2 +  p[:title], p[:id]] }, {:include_blank => true}, :class => "form-control" %>
   </div>    
   </div>    
 
 
+  <div class="form-group">
+    <%= f.label :template_id, Kanjai::Domain.human_attribute_name(:template_id), class: 'col-form-label' %>
+    <%= f.select :template_id, Kanjai::PageTemplate.where(unzip: true).collect{|p|  [p.title, p.id] }, {:include_blank => true}, :class => "form-control" %>
+  </div>      
+
 
 
 
 
   <div class="card-footer mt-20">
   <div class="card-footer mt-20">

@@ -110,6 +110,7 @@ en:
         default_lang_id: "Default Language"
         default_lang_id: "Default Language"
         robots: "robots.txt"
         robots: "robots.txt"
         page_404_id: "Page 404"
         page_404_id: "Page 404"
+        template: "Template"
 
 
   actions:
   actions:
     create: Save
     create: Save

+class AddTemplateToDomain < ActiveRecord::Migration[5.2]
+  def change
+    add_reference :kanjai_domains, :template, index: true
+  end
+end

 module Kanjai
 module Kanjai
-  VERSION = "0.0.361"
+  VERSION = "0.0.362"
 end
 end