Merge remote-tracking branch 'origin/educoder' into educoder

app/views/competitions/_add_md_contents.html.erb

@@ -42,7 +42,7 @@
 
     <div class="clearfix mb30 mt30">
       <a href="javascript:void(0);" class="defalutSubmitbtn fl mr20" onclick="competition_md_content_submit();">提交</a>
-      <a href="<%= md_content_competitions_path(@md_content) %>" class="defalutCancelbtn fl">取消</a>
+      <a href="<%= md_content_competitions_path(:md_content_id => @md_content) %>" class="defalutCancelbtn fl">取消</a>
     </div>
   </div>
 <% end %>

app/views/competitions/_ccf_competition.html.erb

@@ -5,8 +5,10 @@
     <img src="<%= named_attachment_path(@images[2], @images[2].try(:filename)) %>" width="100%"/>
     <div class="ccf-position-shixun">
       <p class="inline">
-        <a href="https://www.educoder.net/boards/5909/topics/34799" target="_blank" class="shixun-btn">入库标准</a>
+        <% com_module_1 = @competition.competition_modules.where(:hidden => 0, :name => '入库标准').first %>
-        <a href="https://www.educoder.net/boards/5909/topics/34798" target="_blank" class="shixun-btn">使用说明</a>
+        <a href="<%= md_content_competitions_path(:md_content_id => com_module_1.try(:competition_module_md_content).try(:id)) %>" target="_blank" class="shixun-btn">入库标准</a>
+        <% com_module_2 = @competition.competition_modules.where(:hidden => 0, :name => '使用说明').first %>
+        <a href="<%= md_content_competitions_path(:md_content_id => com_module_2.try(:competition_module_md_content).try(:id)) %>" target="_blank" class="shixun-btn">使用说明</a>
       </p>
     </div>
   </div>