app/models/theme.rb in knitkit-2.0.11 vs app/models/theme.rb in knitkit-2.1.0
- old
+ new
@@ -1,9 +1,11 @@
require 'yaml'
require 'fileutils'
class Theme < ActiveRecord::Base
+ attr_protected :created_at, :updated_at
+
THEME_STRUCTURE = ['stylesheets', 'javascripts', 'images', 'templates']
class << self; attr_accessor :base_layouts_views_path, :knitkit_website_stylesheets_path, :knitkit_website_images_path end
@base_layouts_views_path = "#{Knitkit::Engine.root.to_s}/app/views"
@knitkit_website_stylesheets_path = "#{Knitkit::Engine.root.to_s}/public/stylesheets/knitkit"
@knitkit_website_images_path = "#{Knitkit::Engine.root.to_s}/public/images/knitkit"
@@ -49,11 +51,14 @@
end
end
belongs_to :website
- has_permalink :name, :theme_id, :scope => :website_id,
- :only_when_blank => false, :sync_url => true
+ extend FriendlyId
+ friendly_id :name, :use => [:slugged, :scoped], :slug_column => :theme_id, :scope => [:website_id]
+ def should_generate_new_friendly_id?
+ new_record?
+ end
validates :name, :presence => {:message => 'Name cannot be blank'}
validates_uniqueness_of :theme_id, :scope => :website_id, :case_sensitive => false
before_destroy :delete_theme_files!