Email questions

Also make sure users can answer questions with multiple and text
content and can't answer email questions within application. Added
"Gentoo-dev-announce posting" question to seed

3 files changed, 54 insertions, 0 deletions

diff --git a/app/views/taglibs/detailed.dryml b/app/views/taglibs/detailed.dryml
index f7df48e..ceb8dc9 100644
--- a/app/views/taglibs/detailed.dryml
+++ b/app/views/taglibs/detailed.dryml
@@ -50,3 +50,23 @@
     </answer:>
   </detailed>
 </def>
+
+<def tag="detailed" for="EmailAnswer">
+  <h2>
+    Answer of
+      <with:owner><name/></with>
+    for question
+    "<with:question><name/></with>
+    <a action="edit" if="&can_edit?">(Edit)</a>
+  </h2>
+  <h5>Question:</h5>
+  <with:question><view:content/></with>
+
+  <h5>Answer:</h5>
+  <if:correct>
+    You sent proper email.
+  </if>
+  <else>
+    Email you sent didn't match requirements.
+  </else>
+</def>
diff --git a/app/views/taglibs/forms.dryml b/app/views/taglibs/forms.dryml
index eddfc0f..013f84c 100644
--- a/app/views/taglibs/forms.dryml
+++ b/app/views/taglibs/forms.dryml
@@ -37,3 +37,15 @@
     </div>
   </form>
 </def>
+
+<def tag="form" for="QuestionContentEmail">
+  <form merge param="default">
+    <error-messages param/>
+    <field-list fields="description, req_text" param>
+      <req_text-label:>Requirements</req_text-label:>
+    </field-list>
+    <div param="actions">
+      <submit label="#{ht 'question_content_emails.actions.save', :default=>['Save']}" param/><or-cancel param="cancel"/>
+    </div>
+  </form>
+</def>
diff --git a/app/views/taglibs/views.dryml b/app/views/taglibs/views.dryml
index fcbec6d..79bd41d 100644
--- a/app/views/taglibs/views.dryml
+++ b/app/views/taglibs/views.dryml
@@ -19,3 +19,25 @@
   <%raise HoboError, "view of non-viewable field '#{this_field}' of #{this_parent.typed_id rescue this_parent}" unless can_view?%>
   <input disabled/>
 </def>
+
+<def tag="view" for="QuestionContentEmail">
+  <%=
+    if this.viewable_by?(current_user, :req_text)
+      "#{h(this.req_text).sub("\n", "<br/>\n")}<br/>"
+    else
+      raise HoboError, "view of non-viewable field '#{this_field}' of #{this_parent.typed_id rescue this_parent}"
+    end
+  %>
+
+  <%=
+    if this.viewable_by?(current_user, :description)
+      "#{this.description.to_html}"
+    else
+      raise HoboError, "view of non-viewable field '#{this_field}' of #{this_parent.typed_id rescue this_parent}"
+    end
+  %>
+
+  <if test="&current_user.signed_up?">
+    Your answer should have subject (without quotes) "<%= "#{this.question.id}-#{current_user.try.token}" %>".
+  </if>
+</def>