Merge branch 'develop' into szzh

app/views/homework_common/index.html.erb

@@ -78,11 +78,7 @@
             <div class="mt5">
               <span class="tit_fb"  style="width: auto;"> 开发语言：</span>
               <div class="fl">
-                <% if homework.homework_detail_programing.language.to_i == 1%>
+                <%= homework.language_name%>
-                    C
-                <% elsif homework.homework_detail_programing.language.to_i == 2%>
-                    C++
-                <% end%>
               </div>
             </div>
             <div class="cl"></div>

app/views/users/_course_homework.html.erb

@@ -36,11 +36,7 @@
         <% if activity.homework_type == 2%>
             <div class="homepagePostDeadline mr15">
               语言：
-              <% if activity.homework_detail_programing.language.to_i == 1%>
+              <%= activity.language_name%>
-                  C
-              <% elsif activity.homework_detail_programing.language.to_i == 2%>
-                  C++
-              <% end%>
             </div>
         <% end %>
 

app/views/users/_user_homework_list.html.erb

@@ -34,11 +34,7 @@
             <% if homework_common.homework_type == 2%>
                 <div class="homepagePostDeadline mr15">
                     语言：
-                    <% if homework_common.homework_detail_programing.language.to_i == 1%>
+                    <%= homework_common.language_name%>
-                        C
-                    <% elsif homework_common.homework_detail_programing.language.to_i == 2%>
-                        C++
-                    <% end%>
                 </div>
             <% end %>
             <div class="homepagePostDeadline">

public/javascripts/homework.js

@@ -145,7 +145,14 @@ $(function(){
             test_numbers += 1;
         });
 
-        var language =  $('select.language_type').val() == 1 ? 'C语言' : 'C++语言';
+        var language =  '';
+        if($('select.language_type').val() == 1){
+            language = 'C';
+        }else if($('select.language_type').val() == 2){
+            language = 'C++';
+        }else if($('select.language_type').val() == 3){
+            language = 'Python';
+        }
 
         if (valid) {
             $("input[name=homework_type]").val(2);