From a14460cef9b11b1536132ec40ff89cc6d30b350c Mon Sep 17 00:00:00 2001
From: baiyu <316257774@qq.com>
Date: Tue, 20 Aug 2013 17:34:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=BB=BA=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E6=97=B6=E7=9A=84=E6=A0=A1=E9=AA=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/bids_controller.rb | 4 +++-
 config/locales/en.yml              | 1 +
 config/locales/zh.yml              | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb
index 5b66361bb..73e9b4ab8 100644
--- a/app/controllers/bids_controller.rb
+++ b/app/controllers/bids_controller.rb
@@ -229,8 +229,10 @@ class BidsController < ApplicationController
     @bid.commit = 0
     if @bid.save
       redirect_to respond_path(@bid)
+    else
+      @bid.safe_attributes = params[:bid]
+      render :action => 'new_bid'
     end
-    render :action => 'new_bid'
   end
 
   def more
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e33fda668..dfd494896 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1293,3 +1293,4 @@ en:
   label_issue_query_condition: Query condition
   label_issue_query: Query
   label_issue_cancel_query: Cancel query
+  field_reward_type: The type of reward
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 108a8c4d1..cd5fc81cd 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1313,4 +1313,5 @@ zh:
   button_project_tags_add: 增加
   label_issue_query_condition: 查询条件
   label_issue_query: 查询
-  label_issue_cancel_query: 取消查询
\ No newline at end of file
+  label_issue_cancel_query: 取消查询
+  field_reward_type: 奖励类型
\ No newline at end of file