Commit Graph

2432 Commits

Author SHA1 Message Date
Skud
801347976e Added edit/delete buttons to comment display 2013-02-08 17:24:06 +11:00
Skud
62af897bf1 various prettification 2013-02-08 16:55:55 +11:00
Skud
f45434ff83 redirect to post after new/edit comment 2013-02-08 16:40:27 +11:00
Skud
660c626581 show comments on post page 2013-02-08 16:36:15 +11:00
Skud
acc1f4006f fixed tests to reflect removed fields 2013-02-08 16:13:52 +11:00
Skud
93edede4da Merged from mistaken branch on G/g 2013-02-08 16:11:38 +11:00
Skud
3b3f9d261f can't create a new post without a post_id 2013-02-08 15:02:21 +11:00
Skud
ae59b1e18d pass post_id through to comment 2013-02-08 14:37:57 +11:00
Skud
f66b4a64a3 added comment button to posts 2013-02-08 14:22:49 +11:00
Skud
a0a88bee11 comment form shouldn't have author/post fields 2013-02-08 14:14:07 +11:00
Skud
09727d99b2 show email on profile if wanted 2013-02-06 16:54:15 +11:00
Skud
d5327ebbf3 show_email checkbox on settings page 2013-02-06 16:31:11 +11:00
Skud
363502a807 add show_email field to members 2013-02-06 16:25:17 +11:00
Skud
4f64946de2 Wrote some very basic tests for the improved settings page 2013-02-06 16:10:43 +11:00
Skud
a50bee4828 oops, broke tests with the change to 'Sign in' 2013-02-06 16:00:47 +11:00
gnattery
6da3e4fae5 Added associations and tested them 2013-02-06 15:20:44 +11:00
gnattery
3cff543184 rails g scaffold Comment 2013-02-06 14:49:49 +11:00
Skud
e5d380729e we more or less have a settings page. doesn't WORK though. 2013-02-06 12:46:45 +11:00
Skud
fb37e1abaa fixed a weird variable expansion 2013-02-06 11:41:08 +11:00
Skud
893d92ac72 Added 'Settings' to top nav 2013-02-06 11:39:03 +11:00
Skud
e41293c121 fixed placement of curly braces. tests now pass. 2013-02-05 22:30:28 +11:00
Skud
1ccaab3085 Don't allow members to be accessible with JSON
One of the tests is failing and I can't for the life of me figure out
why. Everything looks fine when I try it with curl from the command
line. Hmm.
2013-02-02 23:37:24 +11:00
Skud
58e5d04d50 controller tests for plantings now pass 2013-02-01 22:55:48 +11:00
Skud
75e8ea1119 I'd rather not use Member.new 2013-02-01 13:37:33 +11:00
Skud
21960a5494 Tried to get controller tests passing.
All are fine except for plantings.  I'm pretty sure hte problem is to do
with these two lines in app/model/ability.rb

  can :update, Planting, :garden => { :owner_id => member.id }
  can :destroy, Planting, :garden => { :owner_id => member.id }

I'm pretty sure that's the right syntax (according to
https://github.com/ryanb/cancan/wiki/Defining-Abilities) but since it's
the update and delete actions that are failing, I guess I must have it
wrong somehow.  Any hints?
2013-02-01 13:25:06 +11:00
Skud
87f14247e0 modified views to use CanCan 2013-02-01 13:24:32 +11:00
Amy
99540d63b4 Add RSS feed for plantings 2013-01-28 20:23:03 -05:00
Amy
0d84f0dde1 Added recent_plantings variable
Wrote tests for recent_plantings, recent_posts, new_crops
2013-01-28 19:30:23 -05:00
Skud
6113be1e69 sorting gardens alphabetically, so behaviour is clearer 2013-01-28 18:19:59 +11:00
Skud
c5547041e0 added test for remembering the right crop/garden 2013-01-28 17:59:39 +11:00
Miles Gould
dc1ab0912f Order crops case-insensitively by default. 2013-01-25 11:19:15 +00:00
Miles Gould
8d2fe8809d Add an uppercase crop factory.
Use it to test that crops are sorted alphabetically in the plantings
form.
2013-01-25 11:12:44 +00:00
Miles Gould
9ebbeb125d Sort crops case-insensitively in the plantings form. 2013-01-25 00:16:50 +00:00
gnattery
9f788ba8df added friendly IDs for plantings, and tests 2013-01-18 16:06:20 +11:00
gnattery
72f38118d9 Slight tweak to garden slug tests 2013-01-18 15:39:10 +11:00
gnattery
d1e3f8ce32 Added description field to gardens 2013-01-18 15:11:11 +11:00
Skud
46dd7ed346 Display thumbnail inside a .well, optionally hide description 2013-01-18 14:04:45 +11:00
Skud
1503cbddad Plantings show on members, gardens, and crops pages
Created a thumbnail to standardise the display.  It's not pretty but it
has the basic info.
2013-01-18 13:40:30 +11:00
Skud
1da6c83fa1 Showing plantings on crops page. Ugly for now, but works. 2013-01-17 15:35:30 +11:00
Skud
a0b74562f5 remote "Note" about random selection of crops 2013-01-17 15:16:38 +11:00
Skud
501cad39f9 Plantings now show up on members and gardens pages 2013-01-17 15:12:37 +11:00
Joseph Caudle
fd54fe8ffe Configure application to have UTC as default timezone
This commit sets the default timezone for the app as UTC for both Time
methods and for ActiveRecord. It also removes an unecessary pair of
parentheses attached to a call to `Time.now` which did not match the
style throughout the rest of the project.

[#41633207]
2013-01-14 22:17:36 -05:00
Skud
4dec806589 FGified the login_member method 2013-01-13 21:46:46 +11:00
Skud
c4cac871d5 Fixed up tests for garden display
These were just wrong wrongety wrong. I think they were from before we
were auto-creating a garden for new members.  Fixed now.
2013-01-13 21:43:20 +11:00
Skud
7579d894aa Renamed default garden in /spec/factory/garden
"My Garden" was too generic and hard to test for -- tests like
rendered.should contain "Garden" are far too easy to have a false
positive pass.  So I renamed it "Springfield Community Garden" so that
false-positive passes were less likely.
2013-01-13 21:32:54 +11:00
Skud
8da9a13eae Changed garden.member_id to garden.owner_id 2013-01-13 21:29:28 +11:00
Skud
df76f2497a renamed Post.member_id to Post.author 2013-01-13 20:57:28 +11:00
Skud
689448f87c renamed Member.username to login_name 2013-01-13 19:14:46 +11:00
Skud
edb59e07ee s/users/members/g -- all tests pass
There's still probably stuff broken, but this seemed like a good spot to
commit.  Sorry for the enormous chunk of code.  I was attempting to
update the views, but found that I needed to update a few things
elsewhere as well to make them work.
2013-01-13 18:33:43 +11:00
Skud
fdb309cdd2 s/users/members/g -- controllers and their tests 2013-01-13 17:53:24 +11:00