Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge pull request #78 from balkansalat/rails3

Browse source 
Added sqlite database for development.
This commit is contained in:
bennibu 2012-10-27 06:33:22 -07:00
commit 4da1af614e
5 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -10,3 +10,4 @@ public/**/*_cached.*
.idea .idea
.get-dump.yml .get-dump.yml
.sass-cache/ .sass-cache/
doc/app/

1
Gemfile
View file

@ -18,6 +18,7 @@ end
gem 'jquery-rails' gem 'jquery-rails'
gem 'mysql2' gem 'mysql2'
gem 'sqlite3', :group => :development
gem "fastercsv" gem "fastercsv"
gem 'prawn' gem 'prawn'
gem 'haml-rails' gem 'haml-rails'

2
Gemfile.lock
View file

@ -141,6 +141,7 @@ GEM
hike (~> 1.2) hike (~> 1.2)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
therubyracer (0.10.2) therubyracer (0.10.2)
libv8 (~> 3.3.10) libv8 (~> 3.3.10)
thor (0.16.0) thor (0.16.0)
@ -179,6 +180,7 @@ DEPENDENCIES
rails3_acts_as_paranoid (~> 0.1.4) rails3_acts_as_paranoid (~> 0.1.4)
sass-rails (~> 3.2.3) sass-rails (~> 3.2.3)
simple_form simple_form
sqlite3
therubyracer therubyracer
uglifier (>= 1.0.3) uglifier (>= 1.0.3)
wikicloth wikicloth

2
app/views/messages/new.haml
View file

@ -36,7 +36,7 @@
#recipients #recipients
= f.input :recipient_tokens, :input_html => { 'data-pre' => User.find_all_by_id(@message.recipients_ids).map { |u| u.token_attributes }.to_json } = f.input :recipient_tokens, :input_html => { 'data-pre' => User.find_all_by_id(@message.recipients_ids).map { |u| u.token_attributes }.to_json }
= f.input :group_id, :as => :select, :collection => Group.order('type DESC, name DESC').all.reject { |g| g.memberships.empty? } = f.input :group_id, :as => :select, :collection => Group.order('type DESC, name ASC').all.reject { |g| g.memberships.empty? }
= f.input :private = f.input :private
= f.input :subject = f.input :subject
= f.input :body = f.input :body

2
doc/README_FOR_APP
View file

@ -1,5 +1,5 @@
Use this README file to introduce your application and point to useful places in the API for learning more. Use this README file to introduce your application and point to useful places in the API for learning more.
Run "rake appdoc" to generate API documentation for your models and controllers. Run "rake doc:app" to generate API documentation for your models and controllers.
= The Foodsoft = The Foodsoft