glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add permission service, refactor map model a bit, add validations

Browse source
This commit is contained in:
Devin Howard 2015-12-17 09:10:52 +08:00
parent bfd4e4f228
commit 2525a6fb65
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/models/map.rb
View file

@ -13,9 +13,11 @@ class Map < ActiveRecord::Base
#:full => ['940x630#', :png] #:full => ['940x630#', :png]
}, },
:default_url => 'https://s3.amazonaws.com/metamaps-assets/site/missing-map.png' :default_url => 'https://s3.amazonaws.com/metamaps-assets/site/missing-map.png'
validates_presence_of :name validates :name, presence: true
validates_presence_of :arranged validates :arranged, presence: true
validate_presence_of :permission validates :arranged, inclusion: { in: [true, false] }
validates :permission, presence: true
validates :permission, inclusion: { in: Perm::ISSIONS }
# Validate the attached image is image/jpg, image/png, etc # Validate the attached image is image/jpg, image/png, etc
validates_attachment_content_type :screenshot, :content_type => /\Aimage\/.*\Z/ validates_attachment_content_type :screenshot, :content_type => /\Aimage\/.*\Z/

5
app/services/perm.rb
View file

@ -1,7 +1,8 @@
class Perm class Perm
# e.g. Perm::ISSIONS
ISSIONS = [:commons, :public, :private]
class << self class << self
# e.g. Perm::ISSIONS
ISSIONS = [:commons, :public, :private]
def short(permission) def short(permission)
case permission case permission

2
config/application.rb
View file

@ -11,7 +11,7 @@ module Metamaps
# -- all .rb files in that directory are automatically loaded. # -- all .rb files in that directory are automatically loaded.
# Custom directories with classes and modules you want to be autoloadable. # Custom directories with classes and modules you want to be autoloadable.
# config.autoload_paths += %W(#{config.root}/extras) config.autoload_paths << Rails.root.join('app', 'services')
# Only load the plugins named here, in the order given (default is alphabetical). # Only load the plugins named here, in the order given (default is alphabetical).
# :all can be used as a placeholder for all plugins not explicitly named. # :all can be used as a placeholder for all plugins not explicitly named.