Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
commit
45339e53d8
@ -1,15 +1,14 @@
|
|||||||
$('#reward_result_<%= @contesting_project_id %>').html('<%= j(
|
$('#reward_result_<%= @contesting_project_id %>').html('<%= j(
|
||||||
|
|
||||||
if get_prize(@b_p).nil? or get_prize(@b_p) == ""
|
if get_prize(@c_p).nil? or get_prize(@c_p) == ""
|
||||||
if @contest.deadline < Date.today
|
if @contest.deadline < Date.today
|
||||||
puts '未评奖'
|
puts '未评奖'
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
|
|
||||||
case get_prize(@b_p)
|
case get_prize(@c_p)
|
||||||
when '-1'
|
when '-1'
|
||||||
image_tag("/images/bid/special_reward.png")
|
image_tag("/images/bid/special_reward.png")
|
||||||
when '1'
|
|
||||||
when '0'
|
when '0'
|
||||||
image_tag("/images/bid/first_reward.png")
|
image_tag("/images/bid/first_reward.png")
|
||||||
when '1'
|
when '1'
|
@ -0,0 +1,30 @@
|
|||||||
|
$('#reward_result_<%= @contesting_softapplication_id %>').html('<%= j(
|
||||||
|
|
||||||
|
if get_prize(@c_sa).nil? or get_prize(@c_sa) == ""
|
||||||
|
if @contest.deadline < Date.today
|
||||||
|
puts '未评奖'
|
||||||
|
end
|
||||||
|
else
|
||||||
|
|
||||||
|
case get_prize(@c_sa)
|
||||||
|
when '-1'
|
||||||
|
image_tag("/images/bid/special_reward.png")
|
||||||
|
when '0'
|
||||||
|
image_tag("/images/bid/first_reward.png")
|
||||||
|
when '1'
|
||||||
|
image_tag("/images/bid/second_reward.png")
|
||||||
|
when '2'
|
||||||
|
image_tag("/images/bid/third_reward.png")
|
||||||
|
when '3'
|
||||||
|
image_tag("/images/bid/forth_reward.png")
|
||||||
|
when '4'
|
||||||
|
image_tag("/images/bid/fifth_reward.png")
|
||||||
|
when '5'
|
||||||
|
image_tag("/images/bid/qualified.png")
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
||||||
|
)
|
||||||
|
%>')
|
||||||
|
|
||||||
|
$('#<%= @contesting_softapplication_id %>').hide()
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,5 @@
|
|||||||
|
class AddDepositProjectUrlToSoftapplications < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
add_column :softapplications, :deposit_project_url, :string
|
||||||
|
end
|
||||||
|
end
|
@ -0,0 +1,7 @@
|
|||||||
|
class AddAuthorToRelativeMemo < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
add_column :relative_memos, :username, :string
|
||||||
|
add_column :relative_memos, :userhomeurl, :string
|
||||||
|
add_column :relative_memos, :date_collected, :date
|
||||||
|
end
|
||||||
|
end
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue