danbarber/danbarberphoto
1
0
Fork 0
mirror of https://github.com/danbee/danbarberphoto synced 2025-03-04 08:49:07 +00:00
Code Issues Releases Wiki Activity

Update gems and fix photo file input.

Browse Source
This commit is contained in:
Dan Barber 2014-07-10 13:07:54 +01:00
parent 433490af41
commit 5c8fb7e169
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Gemfile.lock
View File

@ -40,7 +40,6 @@ GEM
tzinfo (~> 0.3.37) tzinfo (~> 0.3.37)
addressable (2.3.5) addressable (2.3.5)
arel (4.0.2) arel (4.0.2)
atomic (1.1.15)
aws-sdk (1.35.0) aws-sdk (1.35.0)
json (~> 1.4) json (~> 1.4)
nokogiri (>= 1.4.4) nokogiri (>= 1.4.4)
@ -113,7 +112,7 @@ GEM
tilt tilt
hike (1.2.3) hike (1.2.3)
hpricot (0.8.6) hpricot (0.8.6)
i18n (0.6.9) i18n (0.6.11)
jquery-rails (3.1.0) jquery-rails (3.1.0)
railties (>= 3.0, < 5.0) railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
@ -129,7 +128,7 @@ GEM
mime-types (1.25.1) mime-types (1.25.1)
mini_portile (0.5.2) mini_portile (0.5.2)
minitest (4.7.5) minitest (4.7.5)
multi_json (1.9.0) multi_json (1.10.1)
net-scp (1.1.2) net-scp (1.1.2)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
net-ssh (2.8.0) net-ssh (2.8.0)
@ -202,7 +201,7 @@ GEM
simple_form (3.0.1) simple_form (3.0.1)
actionpack (>= 4.0.0, < 4.1) actionpack (>= 4.0.0, < 4.1)
activemodel (>= 4.0.0, < 4.1) activemodel (>= 4.0.0, < 4.1)
skylight (0.3.4) skylight (0.3.17)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
slop (3.4.7) slop (3.4.7)
slugtastic (1.2.1) slugtastic (1.2.1)
@ -223,13 +222,12 @@ GEM
activesupport (>= 3.0) activesupport (>= 3.0)
polyamorous (~> 0.6.0) polyamorous (~> 0.6.0)
thor (0.18.1) thor (0.18.1)
thread_safe (0.2.0) thread_safe (0.3.4)
atomic (>= 1.1.7, < 2)
tilt (1.4.1) tilt (1.4.1)
treetop (1.4.15) treetop (1.4.15)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
tzinfo (0.3.38) tzinfo (0.3.39)
uglifier (2.4.0) uglifier (2.4.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
json (>= 1.8.0) json (>= 1.8.0)

2
app/views/admin/photos/_form.html.haml
View File

@ -6,7 +6,7 @@
= label_tag "photo_category_ids_#{photo_category.id}", photo_category.name = label_tag "photo_category_ids_#{photo_category.id}", photo_category.name
= inputs_field_set do = inputs_field_set do
= f.input :photo = f.input :image, as: :file
= f.input :title = f.input :title
= f.input :description = f.input :description
= f.input :flickr_url = f.input :flickr_url