Brenda Wallace
4f465d808c
We don't need to load the resource again
2016-12-07 23:54:03 +00:00
Shiny
b454132cae
Merge branch 'dev' into bw/useless-assignments
2016-12-01 12:51:13 +13:00
Brenda Wallace
178c181cf5
Merge remote-tracking branch 'upstream/dev' into bw/useless-assignments
...
Conflicts:
app/controllers/crops_controller.rb
app/models/crop.rb
spec/models/scientific_name_spec.rb
2016-11-30 10:32:02 +13:00
Mackenzie Morgan
4857fd8d2e
return from conditional
2016-11-29 12:20:17 -05:00
Mackenzie Morgan
99c8db72d6
syntax
2016-11-29 12:14:16 -05:00
Mackenzie Morgan
53849a26e5
merge
2016-11-29 12:11:52 -05:00
Mackenzie Morgan
9dc02cd3d8
make changes from code review
2016-11-29 12:10:48 -05:00
Mackenzie Morgan
832719b01a
merge from upstream dev
2016-11-29 09:37:25 -05:00
Mackenzie Morgan
e1e9a52186
use a guard clause
2016-11-28 22:08:14 -05:00
Mackenzie Morgan
66c8ce78bc
further DRY up crops controller
2016-11-28 22:04:32 -05:00
Mackenzie Morgan
e1a2b168c9
rename scientific_names.scientific_name to scientific_names.name
...
this mirrors alternate_names.name and allows making code more DRY
2016-11-28 21:57:51 -05:00
Brenda Wallace
8c7fcd9d49
Fixed all useless assignments
2016-11-26 19:36:59 +13:00
Brenda Wallace
07c135eeb5
before_filter is now before_action
2016-11-26 17:20:13 +13:00
Brenda Wallace
723ebff923
Spacing fixes
2016-11-26 12:13:17 +13:00
Brenda Wallace
62e7c716dd
Removed extra empty blank lines
2016-11-26 12:06:02 +13:00
Brenda Wallace
2e46cccd21
Hash alignment
2016-11-26 11:52:10 +13:00
Brenda Wallace
d268d2b09e
Fixed indentation on comments
2016-11-26 11:45:25 +13:00
Brenda Wallace
c878baa886
Indented parameters cleanup
2016-11-26 11:41:07 +13:00
Brenda Wallace
83392ddda1
Indentation clean ups
2016-11-26 10:51:54 +13:00
Brenda Wallace
2872a1c29d
Wrapped all long lines.
...
reduced rubocop's line length limit to 120
2016-11-17 22:02:18 +13:00
Brenda Wallace
bdb057ca0f
Removed all trailing white space
2016-11-14 15:05:32 +13:00
Daniel O'Connor
5d70d822eb
#951 Swap to deliver_later implementation
2016-08-16 10:55:40 +09:30
Daniel O'Connor
6b059cb4f4
Clean up a bit as per #1013 with TODO comments
2016-07-08 17:06:05 +09:30
Daniel O'Connor
7fe75ee52a
Fix DEPRECATION WARNING: #deliver is deprecated.
2016-06-10 15:45:01 +09:30
Daniel O'Connor
4b4e0cf69a
$ rubocop --only HashSyntax --auto-correct
...
483 files inspected, 2018 offenses detected, 2018 offenses corrected
2016-05-19 15:53:11 -04:00
AELOGICA
a581b759a3
Added tests for creating crops with multiple scientific and alternate names
2015-07-17 07:31:53 +08:00
AELOGICA
734b57e395
Fixed feature test errors
2015-07-17 07:31:53 +08:00
AELOGICA
12d151b68c
Added multiple forms for scientific and alternate names on crop creation
2015-07-17 07:31:51 +08:00
Cjay Billones
bb88041fef
[Refactoring] Replace .count and .length with .size for collections
...
Improved program efficiency (in querying in particular) by replacing .count and .length with .size for collections.
Fix error in refactoring
Reverted some .size into .count
2015-06-25 12:09:03 +08:00
Mackenzie Morgan
1b62c5cb97
remove pending/rejected crops from browse and test that, change links on wrangling page to go directly to crop edit and update tests for that
2015-02-25 00:05:56 -05:00
Skud
d0f856d389
Fixed various problems with search matching
2015-02-17 19:20:25 +11:00
Shiho Takagi
70cdab96c4
fixing issue with 1)paginating crop search and 2)crop name autocomplete
2015-02-12 23:00:04 +11:00
Skud
09a78d4661
Merge pull request #701 from Skud/search_tweaks
...
Search tweaks
2015-02-10 20:57:32 +11:00
Skud
66fcad69fa
Paginate search results, make sexy subtitles
2015-02-10 20:48:36 +11:00
Skud
78c4fc36b1
Paginate search results
...
... and include total number in subtitle
2015-02-10 19:26:07 +11:00
Skud
0fc4c3cb4d
Made search result page show a suitable title
2015-02-10 19:07:50 +11:00
Taylor Griffin
cbb4f9d7ac
add rejection notes
2015-02-09 22:17:32 +11:00
Taylor Griffin
2db7bf638b
improve copy for new request email
2015-02-09 20:41:28 +11:00
Taylor Griffin
076a6cc1df
catch up with upstream dev
2015-02-04 21:41:42 +11:00
Taylor Griffin
80a28085f1
make pending crops unviewable to regular members
2015-02-04 14:44:12 +11:00
Taylor Griffin
abece6473b
make rejected and pending crops viewable on wrangle crops page
2015-02-04 14:18:10 +11:00
Taylor Griffin
ff1b941690
validate that a crop hasn't already been rejected or approved
2015-02-04 06:56:51 +11:00
Taylor Griffin
40d13fadb3
write feature spec for requesting a crop
2015-02-01 23:29:31 +11:00
Taylor Griffin
4211ebec76
add request notes to crop request
2015-02-01 17:56:51 +11:00
Taylor Griffin
e86200b942
requester receives a message when crop request is rejected
2015-02-01 17:32:49 +11:00
Taylor Griffin
776b5450f9
requester receives email when crop request is approved
2015-02-01 17:20:48 +11:00
Taylor Griffin
c80b42d9bc
change from approved boolean to approval_status string
2015-02-01 16:52:31 +11:00
Taylor Griffin
a8c203aea0
send emails to all crop wranglers when a new crop is requested
2015-02-01 09:32:50 +11:00
Shiho Takagi
2aa30475e9
merge
2015-02-01 00:14:52 +11:00
Taylor Griffin
41db12d8d7
pending approval crops appear on crops wrangle page
2015-01-31 10:36:02 +11:00
Brenda Wallace