hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改了原有参赛作品显示报500；

Browse Source 
修改了作品删除功能报错
president
wanglinchun 11 years ago
parent 8d77c62359
commit a1083fe900
8 changed files with 327 additions and 305 deletions
Show Stats Download Patch File Download Diff File

5
app/controllers/softapplications_controller.rb
Unescape View File

@ -47,7 +47,7 @@ class SoftapplicationsController < ApplicationController
def show
@softapplication = Softapplication.find(params[:id])
@project = Project.find_by_identifier(@softapplication.deposit_project)
@project = @softapplication.project
# 打分统计
stars_reates = @softapplication.
rates(:quality)
@ -142,7 +142,8 @@ class SoftapplicationsController < ApplicationController
def create
@softapplication = Softapplication.new(params[:softapplication])
@softapplication.user = User.current
@softapplication.deposit_project = params[:project]
#@softapplication.deposit_project = params[:project]
@softapplication.project = Project.find_by_id(params[:project])
@softapplication.save_attachments(params[:attachments])

2
app/helpers/application_helper.rb
Unescape View File

@ -745,7 +745,7 @@ module ApplicationHelper
tmp = Hash.new
tmp={"" => ""}
option.each do |project|
tmp[project.name] = project.identifier
tmp[project.name] = project.id
end
tmp
end

3
app/models/softapplication.rb
Unescape View File

@ -6,10 +6,11 @@ class Softapplication < ActiveRecord::Base
has_many :journals_for_messages, :as => :jour, :dependent => :destroy
has_many :contesting_softapplications, :dependent => :destroy
has_many :projecting_softapplications, :dependent => :destroy
#has_many :projecting_softapplications, :dependent => :destroy
belongs_to :user
belongs_to :project
has_many :contests, :through => :contesting_softapplications
belongs_to :project
def add_jour(user, notes, reference_user_id = 0, options = {})
if options.count == 0

559
app/views/contests/show_attendingcontest.html.erb
View File

File diff suppressed because it is too large Load Diff

10
app/views/softapplications/index.html.erb
Unescape View File

@ -16,13 +16,13 @@
<div style="float: left; width: 600px; padding-top: 6px; margin-left: 8px"><%= softapplication.description.truncate(95, omission: '...') %></div>
<div style="float: left; width: 200px; margin-left: 70px; margin-top: -3px; line-height: 0.5em ">
<%contest = softapplication.contests.first%>
<p>所属竞赛：<%= contest ? link_to(contest.name.truncate(14, omission: '...'), show_attendingcontest_contest_path(contest), title: contest.name.to_s ) : '尚未加入竞赛'%></p>
<p>所属类别：<%= softapplication.app_type_name.truncate(10, omission: '...') %></p>
<p>系统支持：<%= softapplication.android_min_version_available %></p>
<p><%=l(:label_attendingcontestwork_belongs_contest)%>：<%= contest ? link_to(contest.name.truncate(14, omission: '...'), show_attendingcontest_contest_path(contest), title: contest.name.to_s ) : '尚未加入竞赛'%></p>
<p><%=l(:label_attendingcontestwork_belongs_type)%>：<%= softapplication.app_type_name.truncate(10, omission: '...') %></p>
<p><%=l(:label_attendingcontestwork_adaptive_system)%>：<%= softapplication.android_min_version_available %></p>
</div>
<div style="padding-left: 53px">
<span>开发人员：<%= softapplication.application_developers %></span>
<span style="padding-left: 50px">发布时间：<%=format_time softapplication.created_at %></span>
<span><%=l(:label_attendingcontestwork_developers)%>：<%= softapplication.application_developers %></span>
<span style="padding-left: 50px"><%=l(:label_attendingcontestwork_release_time)%>：<%=format_time softapplication.created_at %></span>
</div>
<div style="border-left: 1px solid #d9d8d8; border-bottom: 1px solid #d9d8d8; margin-left: 50px; padding-bottom: 10px; margin-bottom: 20px; width: 66%"></div>
<div class="underline-contests_one" style="margin-top: -7px"></div>

45
app/views/softapplications/show.html.erb
Unescape View File

@ -16,38 +16,35 @@
</td>
</tr>
<tr>
<td style="width: 570px; padding-left:40px; word-wrap: break-word; word-break: break-all">所属类别：<%= @softapplication.app_type_name %></td>
<td style="width: 570px; padding-left:40px; word-wrap: break-word; word-break: break-all"><%=l(:label_attendingcontestwork_belongs_type)%>：<%= @softapplication.app_type_name %></td>
<% contest = @softapplication.contests.first %>
<td style="width: 240px; word-wrap: break-word; word-break: break-all">所属竞赛：<%= contest ? link_to(contest.name, show_attendingcontest_contest_path(contest)) : '尚未加入竞赛' %></td>
<td style="width: 240px; word-wrap: break-word; word-break: break-all"><%=l(:label_attendingcontestwork_belongs_contest)%>：<%= contest ? link_to(contest.name, show_attendingcontest_contest_path(contest)) : '尚未加入竞赛' %></td>
</tr>
<tr>
<td style="padding-left: 40px">发布人员：<%= @softapplication.user.name %></td>
<td>系统支持：<%= @softapplication.android_min_version_available %></td>
<td style="padding-left: 40px"><%=l(:label_attendingcontestwork_release_person)%>：<%= @softapplication.user.name %></td>
<td><%=l(:label_attendingcontestwork_adaptive_system)%>：<%= @softapplication.android_min_version_available %></td>
</tr>
<tr>
<td style="padding-left: 40px">
<span>作品下载：</span>
<span><%=l(:label_attendingcontestwork_download)%>：</span>
<span>
<% options = {:author => true, :deletable => @softapplication.user.eql?(User.current)} %><%= render :partial => 'attachments/app_link', :locals => {:attachments => @app_items, :options => options} %>
</span>
</td>
<td>开发人员：<%= @softapplication.application_developers %></td>
<td><%=l(:label_attendingcontestwork_developers)%>：<%= @softapplication.application_developers %></td>
</tr>
<tr>
<td style="padding-left: 40px">平均评分: <%= rating_for @softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %></td>
<td>发布时间：<%=format_time @softapplication.created_at %></td>
<td style="padding-left: 40px"><%=l(:label_attendingcontestwork_average_scores)%>: <%= rating_for @softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %></td>
<td><%=l(:label_attendingcontestwork_release_time)%>：<%=format_time @softapplication.created_at %></td>
</tr>
<tr>
<td style="padding-left: 40px">
<% if (@softapplication.deposit_project != "nil" && @softapplication.deposit_project != "") %>
<%#= textilizable ("托管项目： " + @project.name) %>
托管项目：<%= link_to "#@project", project_path(@project.id) %>
<% end %>
<% if @project %>
托管项目：<%= link_to "#@project", project_path(@project) %>
<% end %>
</td>
</tr>
</table>
</td>
</tr>
@ -56,7 +53,7 @@
<div style="height: auto; padding-bottom: 10px">
<strong>
<div style="font-size: 15px;">作品简介：</div>
<div style="font-size: 15px;"><%=l(:label_work_description)%>：</div>
</strong>
<div style="padding-top: 5px"><%= @softapplication.description %></div>
@ -64,11 +61,11 @@
<div class="underline-contests_one"></div>
<div style="height: auto; padding-bottom: 10px">
<div style="font-size: 15px;"><strong>作品得分：</strong></div>
<div style="font-size: 15px;"><strong><%=l(:label_work_scores)%>：</strong></div>
<!-- <div>打分总人数:<%= @softapplication.raters(:quality).count %></div> -->
<div style="overflow: hidden">
<div style="margin-left: 15%; float: left">
<div style="padding-left: 45px; padding-bottom: 5px">得分比例</div>
<div style="padding-left: 45px; padding-bottom: 5px"><%=l(:label_work_scores_proportion)%></div>
<div>
<% 100.step(20, -20) do |star| %>
<div data-kls="Softapplication" data-id="2" data-dimension="quality" data-average="3.25" class="rateable div_inline jDisabled" style="height: 20px; width: 115px; overflow: hidden; z-index: 1; position: relative;">
@ -83,14 +80,12 @@
</div>
</div>
<div style="float: left; padding-left: 100px; padding-top:35px " align="center">
<div>最终得分</div>
<div style="padding-top: 1px; font-size: 15px; color: blue"><%= @softapplication.average(:quality).try(:avg).try(:round, 2).to_i.to_s %>
分
</div>
<div><%=l(:label_final_scores)%></div>
<div style="padding-top: 1px; font-size: 15px; color: blue"><%= @softapplication.average(:quality).try(:avg).try(:round, 2).to_i.to_s %>分</div>
<div><%= rating_for @softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %></div>
</div>
<div style="float: left; padding-left: 100px; padding-top:35px;" align="center">
<div>打分总人数</div>
<div><%=l(:label_rating_person_amount)%></div>
<div style="padding-top: 1px; font-size: 25px; color: blue;">
<strong><%= @softapplication.raters(:quality).count %></strong></div>
</div>
@ -100,7 +95,7 @@
<div style="height: auto; padding-bottom: 10px">
<strong>
<div style="font-size: 15px">作品截图：</div>
<div style="font-size: 15px"><%=l(:label_work_photo)%>：</div>
</strong>
<div class="softapplication-img" >
@ -119,9 +114,9 @@
<div class="underline-contests_one"></div>
<div style="height: 50px">
<div style="font-size: 15px"><strong>作品评论：</strong></div>
<div style="font-size: 15px"><strong><%=l(:label_work_comment)%>：</strong></div>
<% if (User.current.logged? and User.current.id != @softapplication.user_id) %>
<div style="padding-left: 210px">评分: <%= rating_for @softapplication, dimension: :quality, class: 'rateable div_inline' %>
<div style="padding-left: 210px"><%=l(:label_work_rating)%>: <%= rating_for @softapplication, dimension: :quality, class: 'rateable div_inline' %>
<span style="font-size: 11px">(您可以重新打分，打分结果以最后一次打分为主！)</span></div>
<% end %>

5
db/migrate/20140526104509_add_project_to_softapplication.rb
Unescape View File

@ -0,0 +1,5 @@
class AddProjectToSoftapplication < ActiveRecord::Migration
def change
add_column :softapplications, :project_id, :integer
end
end

3
db/schema.rb
Unescape View File

@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20140526031949) do
ActiveRecord::Schema.define(:version => 20140526104509) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@ -803,6 +803,7 @@ ActiveRecord::Schema.define(:version => 20140526031949) do
t.string "application_developers"
t.string "deposit_project_url"
t.string "deposit_project"
t.integer "project_id"
end
create_table "students_for_courses", :force => true do |t|

Write Preview
Loading…
Cancel
Save