From efb6c1fd19c15760f657ff0ea8f923e94ac32300 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 18 Jun 2014 10:07:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E3=80=81=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=A2=9E=E5=8A=A0=E6=8F=90=E4=BA=A4=E9=A1=B9?=
=?UTF-8?q?=E7=9B=AE=E9=80=89=E9=A1=B9(=E5=8F=AF=E4=BB=A5=E4=B8=BA?=
=?UTF-8?q?=E7=A9=BA)=202.homework=5Fattach=E4=B8=8Eproject=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/homework_attach_controller.rb | 4 +++-
app/models/homework_attach.rb | 3 ++-
app/models/project.rb | 1 +
app/views/homework_attach/edit.html.erb | 5 +++--
app/views/homework_attach/new.html.erb | 6 ++++++
db/schema.rb | 12 +++++++-----
6 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb
index 48187bdc2..652025fc3 100644
--- a/app/controllers/homework_attach_controller.rb
+++ b/app/controllers/homework_attach_controller.rb
@@ -77,6 +77,7 @@ class HomeworkAttachController < ApplicationController
if bid.homeworks.where("user_id = ?",User.current).count == 0
user_id = params[:user_id]
bid_id = params[:bid_id]
+ project_id = params[:new_form][:project_id]
sta = 0
name = params[:new_form][:name]
description = params[:new_form][:description]
@@ -85,7 +86,8 @@ class HomeworkAttachController < ApplicationController
:state => sta,
:name => name,
:description => description,
- :bid_id => bid_id
+ :bid_id => bid_id,
+ :project_id => project_id
}
diff --git a/app/models/homework_attach.rb b/app/models/homework_attach.rb
index e60d4230b..99d540bd1 100644
--- a/app/models/homework_attach.rb
+++ b/app/models/homework_attach.rb
@@ -9,6 +9,7 @@ class HomeworkAttach < ActiveRecord::Base
has_many :homework_users, :dependent => :destroy
has_many :users, :through => :homework_users
seems_rateable :allow_update => true, :dimensions => :quality
+ belongs_to :project
safe_attributes "bid_id",
"user_id"
@@ -30,7 +31,7 @@ class HomeworkAttach < ActiveRecord::Base
result
end
- def project
+ def project_for_homework
work = HomeworkForCourse.find_by_bid_id(self.bid_id)
if work
work.project
diff --git a/app/models/project.rb b/app/models/project.rb
index b8e11d99e..ee9f7b2f7 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -30,6 +30,7 @@ class Project < ActiveRecord::Base
# Specific overidden Activities
+ belongs_to :homework_attach
has_many :time_entry_activities
has_many :members, :include => [:principal, :roles], :conditions => "#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE}"
has_many :memberships, :class_name => 'Member'
diff --git a/app/views/homework_attach/edit.html.erb b/app/views/homework_attach/edit.html.erb
index e5e3e0057..bfcf1f646 100644
--- a/app/views/homework_attach/edit.html.erb
+++ b/app/views/homework_attach/edit.html.erb
@@ -46,9 +46,10 @@
<%= f.text_field :name, :required => true, :name => "homework_name", :size => 60, :style => "width:490px;"%>
- 关联项目：
- <%= f.select :project_id, options_for_select(user_projects_option),:name => "project_id", :required => true%>
+ 提交项目：
+ <%= f.select :project_id, options_for_select(user_projects_option,@homework.project.id),:name => "project_id", :required => true%>
<%= link_to '创建项目', new_project_path(course: 0, project_type: 0), :target => '_blank' %>
+
提交项目可以为空
描 述：
diff --git a/app/views/homework_attach/new.html.erb b/app/views/homework_attach/new.html.erb
index 618fc15a1..c74d17bdd 100644
--- a/app/views/homework_attach/new.html.erb
+++ b/app/views/homework_attach/new.html.erb
@@ -26,6 +26,12 @@
标 题：
<%= f.text_field "name", :required => true, :size => 60, :style => "width:490px;" %>
+
+ 提交项目：
+ <%= f.select :project_id, options_for_select(user_projects_option),:name => "project_id", :required => true%>
+ <%= link_to '创建项目', new_project_path(course: 0, project_type: 0), :target => '_blank' %>
+
提交项目可以为空
+
描 述：
diff --git a/db/schema.rb b/db/schema.rb
index b7de4e0b2..fc2151165 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -961,11 +961,13 @@ ActiveRecord::Schema.define(:version => 20140617092219) do
end
create_table "user_scores", :force => true do |t|
- t.integer "user_id"
- t.integer "collaboration"
- t.integer "influence"
- t.integer "skill"
- t.integer "activity"
+ t.integer "user_id", :null => false
+ t.integer "collaboration"
+ t.integer "influence"
+ t.integer "skill"
+ t.integer "active"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
end
create_table "user_statuses", :force => true do |t|