mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-02 05:31:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

include crop approval status in sci and alt names

Browse Source
This commit is contained in:
Taylor Griffin
2015-02-27 07:39:07 +11:00
parent c76e9ccbf6
commit 3a9ec8cf6d
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/alternate_names/show.html.haml
View File

@@ -1,5 +1,7 @@
%p#notice= notice
= render :partial => 'crops/approval_status_message', :locals => { :crop => @alternate_name.crop }
%p
%b Alternate name:
= @alternate_name.name

11
app/views/crops/_approval_status_message.html.haml Normal file
View File

@@ -0,0 +1,11 @@
- if crop.pending?
.alert.alert-danger
%b This crop is currently pending approval.
%p This crop was requested by #{crop.requester} #{time_ago_in_words(crop.created_at)} ago.
- unless crop.request_notes.blank?
%p
Request notes: #{crop.request_notes}
- if crop.rejected?
.alert.alert-danger
%b This crop was rejected for the following reason: #{crop.reason_for_rejection == "other" ? crop.rejection_notes : crop.reason_for_rejection}.

12
app/views/crops/show.html.haml
View File

@@ -1,17 +1,7 @@
- content_for :title, @crop.name
- content_for :subtitle, @crop.default_scientific_name
- if @crop.pending?
.alert.alert-danger
%b This crop is currently pending approval.
%p This crop was requested by #{@crop.requester} #{time_ago_in_words(@crop.created_at)} ago.
- unless @crop.request_notes.blank?
%p
Request notes: #{@crop.request_notes}
- if @crop.rejected?
.alert.alert-danger
%b This crop was rejected for the following reason: #{@crop.reason_for_rejection == "other" ? @crop.rejection_notes : @crop.reason_for_rejection}.
= render :partial => 'approval_status_message', :locals => { :crop => @crop }
- if @crop.approved?
- content_for :buttonbar do

2
app/views/scientific_names/show.html.haml
View File

@@ -1,5 +1,7 @@
%p#notice= notice
= render :partial => 'crops/approval_status_message', :locals => { :crop => @scientific_name.crop }
%p
%b Scientific name:
= @scientific_name.scientific_name