mokio 0.0.13 → 0.0.14

data/lib/mokio/concerns/controllers/contacts.rb

@@ -8,12 +8,50 @@ module Mokio
         extend ActiveSupport::Concern
 
         included do
+
+          before_action :init_obj, :set_author, :only =>[:create]
+          before_action :set_editor, :only => [:create, :update]
+
+        end
+
+        #
+        # Overriten create from CommonController#create (Mokio::Concerns::Controllers::Common)
+        #
+        def create
+          respond_to do |format|
+            if obj.save
+              if !params[:save_and_new].blank?
+                format.html { redirect_to obj_new_url(@obj_class.new), notice: Mokio::Concerns::Common::Translations::CommonTranslation.created(obj) }
+                format.json { render action: 'new', status: :created, location: obj }
+              else
+                format.html { redirect_to obj_index_url, notice: Mokio::Concerns::Common::Translations::CommonTranslation.created(obj) }
+                format.json { render action: 'index', status: :created, location: obj }
+              end
+            else
+              format.html { render "new", notice: Mokio::Concerns::Common::Translations::CommonTranslation.not_created(obj) }
+              format.json { render json: @obj.errors, status: :unprocessable_entity }
+            end
+          end
+        end
+
+        def init_obj
+          create_obj( @obj_class.new(obj_params) )
+        end
+
+        def set_author
+          obj.created_by = current_user.id
+        end
+
+        def set_editor
+          obj.updated_by = current_user.id
+          set_author if obj.created_by.blank? # for backward compatibility
         end
 
         #
         # Extended CommonController new (Mokio::Concerns::Controllers::Common)
         #
         def new
+
           super
           obj.build_contact_template
         end
@@ -28,7 +66,7 @@ module Mokio
           # Never trust parameters from the scary internet, only allow the white list through.
           #
           def contact_params #:doc:
-            params.require(:contact).permit(extended_parameters, :title, :subtitle, :intro, :content, :article_type, :contact, :active,:home_page, :lang_id, :recipient_emails, :menu_ids => [], :contact_template_attributes => Mokio::ContactTemplate.contact_template_attributes)
+            params.require(:contact).permit(extended_parameters,mokio_gems_parameters,:title, :subtitle, :intro, :content, :article_type, :contact, :active,:home_page, :lang_id, :recipient_emails, :menu_ids => [], :contact_template_attributes => Mokio::ContactTemplate.contact_template_attributes)
           end
       end
     end

data/lib/mokio/concerns/controllers/contents.rb

@@ -8,6 +8,7 @@ module Mokio
         extend ActiveSupport::Concern
 
         included do
+          include Mokio::Concerns::Controllers::MainPics
         end
 
         #

data/lib/mokio/concerns/controllers/main_pics.rb

@@ -0,0 +1,32 @@
+module Mokio
+  module Concerns
+    module Controllers
+      #
+      # Concern for ContentsController
+      #
+      module MainPics
+        extend ActiveSupport::Concern
+
+        included do
+
+          def delete_main_pic
+            obj = Mokio::Content.find(params[:id])
+            obj.remove_main_pic!
+            
+            if obj.save!
+              flash[:notice] = t("main_pics.deleted")
+            else
+              flash[:error] = t("main_pics.not_deleted")
+            end
+
+            respond_to do |format|
+              format.js
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/mokio/concerns/controllers/menus.rb

@@ -25,6 +25,7 @@ module Mokio
         # extended CommonController#index (Mokio::Concerns::Controllers::Common)
         #
         def index
+
           @menus = Mokio::Menu.includes(:content_links).arrange(:order => :seq)
           super
         end
@@ -71,7 +72,7 @@ module Mokio
           render :nothing => true
         end
 
-        # Renders form for creating menu positon (fake menu - direct child of a lang root)
+        # Renders form for creating menu position (fake menu - direct child of a lang root)
 
         def new_menu_position
           @menu = Mokio::Menu.new
@@ -169,7 +170,7 @@ module Mokio
           # Never trust parameters from the scary internet, only allow the white list through.
           #
           def menu_params #:doc:
-            params[:menu].permit(:name, :subtitle, :seq, :target, :external_link, :css_class, :css_body_class, :main_pic, :follow, :parent_id, :active, :visible, :description, :lang_id, :fake, :content_ids => [],:available_module_ids => [],
+            params[:menu].permit(extended_parameters,mokio_gems_parameters, :name, :subtitle, :seq, :target, :external_link, :css_class, :css_body_class, :main_pic, :follow, :parent_id, :active, :visible, :description, :lang_id, :fake, :content_ids => [],:available_module_ids => [],
               :meta_attributes => Mokio::Meta.meta_attributes)
           end
       end

data/lib/mokio/concerns/controllers/mov_galleries.rb

@@ -8,14 +8,30 @@ module Mokio
         extend ActiveSupport::Concern
 
         included do
+
+          before_action :init_obj, :set_author, :only =>[:create]
+          before_action :set_editor, :only => [:create, :update]
+
+        end
+
+        def init_obj
+          @mov_gallery = Mokio::MovGallery.new(mov_gallery_params)
+        end
+
+        def set_author
+          @mov_gallery.created_by = current_user.id
+        end
+
+        def set_editor
+          obj.updated_by = current_user.id
+          set_author if obj.created_by.blank? # for backward compatibility
         end
 
+
         #
         # Overriten create from CommonController#create (Mokio::Concerns::Controllers::Common)
         #
         def create
-          @mov_gallery = Mokio::MovGallery.new(mov_gallery_params)
-
           respond_to do |format|
             if @mov_gallery.save
               if !params[:save_and_new].blank?
@@ -39,7 +55,7 @@ module Mokio
           # Never trust parameters from the scary internet, only allow the white list through.
           #
           def mov_gallery_params #:doc:
-            params.require(:mov_gallery).permit(:title, :subtitle, :type, :active, :home_page ,:intro, :content, :display_from, :display_to, :lang_id, :main_pic, :tag_list, :menu_ids => [], :data_file => [],
+            params.require(:mov_gallery).permit(mokio_gems_parameters,:title, :subtitle, :type, :active, :home_page ,:intro, :content, :display_from, :display_to, :lang_id, :main_pic, :tag_list, :menu_ids => [], :data_file => [],
               :meta_attributes => Mokio::Meta.meta_attributes)
           end
       end

data/lib/mokio/concerns/controllers/photos.rb

@@ -313,7 +313,7 @@ module Mokio
             # Never trust parameters from the scary internet, only allow the white list through.
             #
             def photo_params #:doc:
-              params.require(:photo).permit(:name, :subtitle, :intro, :external_link, :thumb, :active, :content_id, :data_file, :remote_data_file_url, :seq)
+              params.require(:photo).permit(:name, :subtitle, :intro, :external_link, :thumb, :active, :content_id,:base_content_id, :data_file, :remote_data_file_url, :seq)
             end
 
             #

data/lib/mokio/concerns/controllers/pic_galleries.rb

@@ -8,14 +8,29 @@ module Mokio
         extend ActiveSupport::Concern
 
         included do
+
+          before_action :init_obj, :set_author, :only =>[:create]
+          before_action :set_editor, :only => [:create, :update]
+
+        end
+
+        def init_obj
+          @pic_gallery = Mokio::PicGallery.new(pic_gallery_params)
+        end
+
+        def set_author
+          @pic_gallery.created_by = current_user.id
+        end
+
+        def set_editor
+          obj.updated_by = current_user.id
+          set_author if obj.created_by.blank? # for backward compatibility
         end
 
         #
         # Overriten create from CommonController#create (Mokio::Concerns::Controllers::Common)
         #
         def create
-          @pic_gallery = Mokio::PicGallery.new(pic_gallery_params)
-
           respond_to do |format|
             if @pic_gallery.save
               if !params[:save_and_new].blank?
@@ -39,7 +54,7 @@ module Mokio
           # Never trust parameters from the scary internet, only allow the white list through.
           #
           def pic_gallery_params #:doc:
-            params.require(:pic_gallery).permit(:title, :subtitle, :type, :active,:home_page, :intro, :content, :display_from, :display_to, :lang_id, :main_pic, :tag_list, :menu_ids => [], :data_file => [],
+            params.require(:pic_gallery).permit(mokio_gems_parameters,:title, :subtitle, :type, :active,:home_page, :intro, :content, :display_from, :display_to, :lang_id, :main_pic, :tag_list, :menu_ids => [], :data_file => [],
               :meta_attributes => Mokio::Meta.meta_attributes)
           end
       end

data/lib/mokio/concerns/models/article.rb

@@ -8,6 +8,7 @@ module Mokio
         extend ActiveSupport::Concern
 
         included do
+
         end
       end
     end

data/lib/mokio/concerns/models/base_article.rb

@@ -0,0 +1,21 @@
+module Mokio
+  module Concerns
+    module Models #:nodoc:
+      #
+      # Concern for Mokio::Article model
+      #
+      module BaseArticle
+        extend ActiveSupport::Concern
+
+        included do
+          attr_accessor :form_active
+
+          def form_active
+            false
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/mokio/concerns/models/base_contact.rb

@@ -0,0 +1,36 @@
+module Mokio
+  module Concerns
+    module Models
+      #
+      # Concern for Contact model
+      #
+      module BaseContact
+        extend ActiveSupport::Concern
+
+        included do
+          has_many :recipients, dependent: :destroy
+          has_one :contact_template, dependent: :destroy ,:foreign_key => "contact_id"
+
+          accepts_nested_attributes_for :recipients
+          accepts_nested_attributes_for :contact_template
+          
+          # delegate :tpl, to: :contact_template
+        end
+
+        #
+        # Get recipient_id's for given email
+        #
+        def recipient_emails=(emails)
+          self.recipients = emails.delete(' ').split(',').map {|m| Mokio::Recipient.new(email: m) }
+        end
+
+        #
+        # Return recipient emails
+        #
+        def recipient_emails
+          self.recipients.map(&:email).join(',')
+        end
+      end
+    end
+  end
+end

data/lib/mokio/concerns/models/base_content.rb

@@ -0,0 +1,51 @@
+module Mokio
+  module Concerns
+    module Models
+      #
+      # Concern for Content model
+      #
+      module BaseContent
+        extend ActiveSupport::Concern
+
+        included do
+          include Mokio::Concerns::Models::Common
+
+          has_many :data_files, :dependent => :destroy, :foreign_key => :base_content_id
+          has_many :contents ,:dependent => :destroy
+
+          # validates :title, presence: true
+          # validate :contents
+          accepts_nested_attributes_for :contents
+          accepts_nested_attributes_for :data_files, :allow_destroy => true, :reject_if => lambda { |d| d[:data_file].blank? }
+
+          mount_uploader :main_pic, Mokio::MainPicUploader
+          after_save :update_etag
+
+        end
+
+        module ClassMethods
+          #
+          # Columns for table in CommonController#index view
+          #
+          def columns_for_table
+            %w(title)
+          end
+        end
+
+        def update_etag
+          self.touch(:etag)
+        end
+
+        def editable
+          true
+        end
+
+        def deletable
+          true
+        end
+
+
+      end
+    end
+  end
+end

data/lib/mokio/concerns/models/base_mov_gallery.rb

@@ -0,0 +1,19 @@
+module Mokio
+  module Concerns
+    module Models
+      #
+      # Concern for MovGallery model
+      #
+      module BaseMovGallery
+        extend ActiveSupport::Concern
+
+        included do
+        end
+
+        def default_data_file
+          Mokio::Youtube
+        end
+      end
+    end
+  end
+end

data/lib/mokio/concerns/models/base_pic_gallery.rb

@@ -0,0 +1,22 @@
+module Mokio
+  module Concerns
+    module Models
+      #
+      # Concern for PicGallery model
+      #
+      module BasePicGallery
+        extend ActiveSupport::Concern
+
+        included do
+        end
+
+        #
+        # Return constant
+        #
+        def default_data_file
+          Mokio::Photo
+        end
+      end
+    end
+  end
+end

data/lib/mokio/concerns/models/common.rb

@@ -126,7 +126,7 @@ module Mokio
           if self.class.has_meta_enabled?
             self.empty_meta = true if self.meta.present? && (self.meta.g_title.blank? || self.meta.f_title.blank? || self.meta.g_application_name.blank?)
 
-            application_name = Rails.application.class.to_s.split("::").first 
+            application_name = Rails.application.class.to_s.split("::").first
             self.meta.g_title            = self.title       if self.meta.present? && self.meta.g_title.blank?
             self.meta.f_title            = self.title       if self.meta.present? && self.meta.f_title.blank?
             self.meta.g_application_name = application_name if self.meta.present? && self.meta.g_application_name.blank?

data/lib/mokio/concerns/models/contact_template.rb

@@ -8,6 +8,10 @@ module Mokio
         extend ActiveSupport::Concern
 
         included do
+
+          belongs_to :base_contact
+          accepts_nested_attributes_for :base_contact
+
           belongs_to :contact
           accepts_nested_attributes_for :contact
         end

data/lib/mokio/concerns/models/content.rb

@@ -17,6 +17,10 @@ module Mokio
           belongs_to :gmap, :dependent => :destroy  # Relation with gmap isn't necessary !
           belongs_to :meta, :dependent => :destroy
 
+          belongs_to :author, :class_name => 'Mokio::User', :foreign_key => :created_by
+          belongs_to :editor, :class_name => 'Mokio::User', :foreign_key => :updated_by
+          belongs_to :lang
+
           mount_uploader :main_pic, Mokio::MainPicUploader
 
           accepts_nested_attributes_for :menus
@@ -51,6 +55,14 @@ module Mokio
           end
         end
 
+        def author_name
+          author.name_view unless author.blank?
+        end
+
+        def editor_name
+          editor.name_view unless editor.blank?
+        end
+
         #
         # Touching etag field
         #

data/lib/mokio/concerns/models/data_file.rb

@@ -13,7 +13,8 @@ module Mokio
           friendly_id :slug_candidates, use: :slugged
           validates_uniqueness_of :slug
           belongs_to :contents, :touch => true
-          
+          belongs_to :base_contents
+
           mount_uploader :data_file, Mokio::DataFileUploader
           mount_uploader :thumb,     Mokio::ThumbUploader
 
@@ -60,8 +61,13 @@ module Mokio
         # For some reason touch => true does not work for DataFile :(
         #
         def touch_content
-          Mokio::Content.find(self.content_id).touch(:etag)
-        end
+          if self.content_id.present?
+            Mokio::Content.find(self.content_id).touch(:etag)
+          else
+            Mokio::BaseContent.find(self.base_content_id).touch(:etag)
+
+          end
+          end
 
         def slide?
           false