Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/poll/_poll_form.html.erb

@@ -25,13 +25,13 @@
       }
 
       //添加标题时确定按钮
-      function add_poll_question(obj)
+      function add_poll_question(doc)
       {
           var title = $.trim($("#poll_questions_title").val());
           if(title.length == 0){alert("标题不能为空");}else{doc.parent().parent().parent().submit();}
       }
       //修改标题时确定按钮
-      function edit_poll_question(obj,id)
+      function edit_poll_question(doc,id)
       {
           var title = $.trim($("#poll_questions_title_" + id).val());
           if(title.length == 0){alert("标题不能为空");}else{doc.parent().parent().parent().submit();}