Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
This commit is contained in:
yanxd
commit
a5cdbc8e92
|
|
@ -13,7 +13,6 @@ class BidsController < ApplicationController
|
|||
helper :attachments
|
||||
include AttachmentsHelper
|
||||
helper :projects
|
||||
|
||||
def index
|
||||
@project_type = params[:project_type]
|
||||
# Modified by nie
|
||||
|
|
@ -264,7 +263,6 @@ class BidsController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
|
||||
##### by huang
|
||||
def show_project_homework
|
||||
# flash[:notice] = ""
|
||||
|
|
@ -371,6 +369,20 @@ class BidsController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
#删除作业
|
||||
#by xianbo
|
||||
def homework_destroy
|
||||
@bid_to_destroy = Bid.find params[:course_id]
|
||||
(render_403; return false) unless User.current.admin?||User.current.id==@bid_to_destroy.author_id
|
||||
@bid_to_destroy.destroy
|
||||
respond_to do |format|
|
||||
format.html { redirect_to :back }
|
||||
format.js
|
||||
#format.api { render_api_ok }
|
||||
end
|
||||
end
|
||||
|
||||
#end by xianbo
|
||||
##引用
|
||||
def new
|
||||
@jour = JournalsForMessage.find(params[:journal_id]) if params[:journal_id]
|
||||
|
|
@ -395,6 +407,7 @@ class BidsController < ApplicationController
|
|||
@bid = Bid.new
|
||||
@bid.safe_attributes = params[:bid]
|
||||
end
|
||||
|
||||
#huang
|
||||
def create_contest
|
||||
@bid = Bid.new
|
||||
|
|
@ -418,7 +431,6 @@ class BidsController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
|
||||
#huang
|
||||
def new_contest
|
||||
@bid = Bid.new
|
||||
|
|
@ -523,7 +535,6 @@ class BidsController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
|
||||
def back
|
||||
@jour = @bid.journals_for_messages
|
||||
@jour.each_with_index {|j,i| j.indice = i+1}
|
||||
|
|
@ -556,7 +567,6 @@ class BidsController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
|
||||
# added by william
|
||||
# used to manage the bid and end the bid
|
||||
def manage
|
||||
|
|
|
|||
|
|
@ -23,12 +23,14 @@ class UsersController < ApplicationController
|
|||
menu_item :requirement_focus, :only => :watch_bids
|
||||
menu_item :user_newfeedback, :only => :user_newfeedback
|
||||
menu_item :user_course, :only => :user_courses
|
||||
menu_item :user_homework, :only => :user_homeworks
|
||||
#Ended by young
|
||||
|
||||
|
||||
before_filter :require_admin, :except => [:show, :index, :search, :tag_save, :user_projects, :user_newfeedback, :user_comments, :watch_bids, :info, :user_watchlist, :user_fanslist,:update, :user_courses]
|
||||
before_filter :require_admin, :except => [:show, :index, :search, :tag_save, :user_projects, :user_newfeedback, :user_comments, :watch_bids, :info, :user_watchlist, :user_fanslist,:update,
|
||||
:user_courses, :user_homeworks]
|
||||
#edit has been deleted by huang, 2013-9-23
|
||||
before_filter :find_user, :only => [:user_fanslist, :user_watchlist, :show, :edit, :update, :destroy, :edit_membership, :user_courses,
|
||||
before_filter :find_user, :only => [:user_fanslist, :user_watchlist, :show, :edit, :update, :destroy, :edit_membership, :user_courses, :user_homeworks,
|
||||
:destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments, :watch_bids, :info]
|
||||
accept_api_auth :index, :show, :create, :update, :destroy,:tag_save
|
||||
|
||||
|
|
@ -79,7 +81,7 @@ class UsersController < ApplicationController
|
|||
def watch_bids
|
||||
cond = 'bids.reward_type <> 1'
|
||||
@bids = Bid.watched_by(@user)
|
||||
@bids = Bid.visible.where('reward_type = ?', 1) # modified by huang
|
||||
@bids = Bid.visible.where('reward_type = ?', 1) # added by huang
|
||||
@offset, @limit = api_offset_and_limit({:limit => 10})
|
||||
@bid_count = @bids.count
|
||||
@bid_pages = Paginator.new @bid_count, @limit, params['page']
|
||||
|
|
@ -123,19 +125,32 @@ class UsersController < ApplicationController
|
|||
end
|
||||
# end
|
||||
|
||||
# added by fq
|
||||
def user_courses
|
||||
case params[:type]
|
||||
when "2"
|
||||
# added by huang
|
||||
def user_homeworks
|
||||
@membership = @user.memberships.all(:conditions => Project.visible_condition(User.current))
|
||||
@memberships = []
|
||||
@membership.each do |membership|
|
||||
if membership.project.project_type == 1
|
||||
@membership << membership
|
||||
@memberships << membership
|
||||
end
|
||||
end
|
||||
@bid = []
|
||||
@memberships.each do |membership|
|
||||
@bid += membership.project.homeworks
|
||||
end
|
||||
@bid = @bid.group_by {|bid| bid.courses.first.id}
|
||||
#add by huang
|
||||
unless User.current.admin?
|
||||
if !@user.active?
|
||||
render_404
|
||||
return
|
||||
end
|
||||
end
|
||||
end
|
||||
@state = 2
|
||||
|
||||
# added by fq
|
||||
def user_courses
|
||||
case params[:type]
|
||||
when "1"
|
||||
@membership = @user.memberships.all(:conditions => Project.visible_condition(User.current))
|
||||
@memberships = []
|
||||
|
|
|
|||
|
|
@ -55,7 +55,6 @@ class Bid < ActiveRecord::Base
|
|||
acts_as_activity_provider :find_options => {:include => [:projects, :author]},
|
||||
:author_key => :author_id
|
||||
|
||||
|
||||
safe_attributes 'name',
|
||||
'description',
|
||||
'budget',
|
||||
|
|
@ -64,7 +63,6 @@ class Bid < ActiveRecord::Base
|
|||
# safe_attributes 'name',
|
||||
# 'description',
|
||||
# 'deadline'
|
||||
|
||||
def add_jour(user, notes, reference_user_id = 0)
|
||||
self.journals_for_messages << JournalsForMessage.new(:user_id => user.id, :notes => notes, :reply_id => reference_user_id)
|
||||
end
|
||||
|
|
@ -122,5 +120,4 @@ class Bid < ActiveRecord::Base
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -7,22 +7,34 @@
|
|||
<td>
|
||||
<table width="100%" border="0">
|
||||
<tr>
|
||||
<td colspan="2" valign="top"><strong><%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author), :class => 'bid_user') %>: <%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %></strong></td>
|
||||
<td colspan="2" valign="top"><strong><span><%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author), :class => 'bid_user') %>: <%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %></span>
|
||||
|
||||
<span style="float: right"><%= link_to(
|
||||
l(:button_delete),
|
||||
{:action => 'homework_destroy', :controller=>'bids', :course_id => bid.id},
|
||||
:method => :post,
|
||||
:data => {:confirm => l(:text_are_you_sure)},
|
||||
:class => 'icon icon-del'
|
||||
) if (User.current.admin?||User.current.id==bid.author_id)&&(bid.homework_type == 1)%></span></td>
|
||||
</strong></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width="500">
|
||||
<table border="0">
|
||||
<tr>
|
||||
<td> <% if bid.reward_type.nil? or bid.reward_type == 1 %> <strong><%= l(:label_bids_reward_method) %><span style="color: #ed8924;font-family: 14px; font-family: 微软雅黑"><%= l(:label_call_bonus) %> <%= l(:label_RMB_sign) %>
|
||||
<%= bid.budget%></span></strong> <% elsif bid.reward_type == 2 %> <strong><%= l(:label_bids_reward_method) %><span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= bid.budget%></span></strong> <% else %>
|
||||
<%= bid.budget%></span></strong> <% elsif bid.reward_type == 2 %> <strong><%= l(:label_bids_reward_method) %><span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= bid.budget%></span></strong>
|
||||
<% else %>
|
||||
|
||||
<% end %> <!-- <td style="color: rgb(255, 0, 0);"><strong><%= l(:label_price) %><%= l(:label_RMB_sign) %><%= bid.budget%></strong></td> --></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><span class="font_lighter">
|
||||
<% if bid.homework_type == 1%>
|
||||
|
||||
<%= l(:label_x_homework_project, :count => bid.homeworks.count) %>(<strong><%= link_to bid.homeworks.count, project_for_bid_path(bid.id) %></strong>)
|
||||
<% else %><%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<strong><%= link_to bid.biding_projects.count, project_for_bid_path(bid.id) %></strong>)<% end %>
|
||||
<% else %><%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<strong><%= link_to bid.biding_projects.count, project_for_bid_path(bid.id) %>
|
||||
</strong>)<% end %>
|
||||
|
||||
</span><span class="font_lighter"><%= l(:label_x_responses, :count => bid.commit) %>(<strong><%= link_to bid.commit, respond_path(bid) %></strong>)</span></td>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
:method => :post,
|
||||
:data => {:confirm => l(:text_are_you_sure)},
|
||||
:class => 'icon icon-del'
|
||||
) if @message.destroyable_by?(User.current) %>
|
||||
) if @bid.destroyable_by?(User.current) %>
|
||||
</div>
|
||||
|
||||
<h3><%= avatar(@topic.author, :size => "24") %><%=h @topic.subject %></h3>
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
<table border="0">
|
||||
<tr>
|
||||
<td align="cneter">
|
||||
<%= text_field_tag 'course_password', nil, :style => 'width:200px'%></td>
|
||||
</td>
|
||||
|
||||
<%= text_field_tag 'course_password', nil, :size => 45 %>
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
<% else %>
|
||||
<% unless @user != User.current %>
|
||||
<% if @user.user_extensions.identity == 0 %>
|
||||
<%= link_to"#{l(:label_course_new)}",{:controller=>'projects',:action=>'new', :course => 1}, :class => 'icon icon-add' %>
|
||||
<p><%= link_to"#{l(:label_course_new)}",{:controller=>'projects',:action=>'new', :course => 1}, :class => 'icon icon-add' %></p>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<ul class="user_project_sort">
|
||||
|
|
@ -49,11 +49,11 @@
|
|||
<td align="right" >
|
||||
|
||||
<% if membership.roles.sort.collect(&:to_s).join(', ') =='Manager' %>
|
||||
Teacher
|
||||
老师
|
||||
<% elsif membership.roles.sort.collect(&:to_s).join(', ') =='Reporter' %>
|
||||
Student
|
||||
学生
|
||||
<% elsif membership.roles.sort.collect(&:to_s).join(', ') =='TA' %>
|
||||
TA
|
||||
助教
|
||||
<% end %>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -13,21 +13,27 @@
|
|||
<tr>
|
||||
<td colspan="2" valign="top"><strong><%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author), :class => 'bid_user') %>:
|
||||
<%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %>
|
||||
<%= l(:label_course_homework) %> : <%= link_to(bid.courses.first.name, project_path(bid.courses.first)) %></strong></td>
|
||||
<%= l(:label_course_homework) %> : <%= link_to(bid.courses.first.name, project_path(bid.courses.first)) %></strong> </span>
|
||||
<span style="float: right"><%= link_to(
|
||||
l(:button_delete),
|
||||
{:action => 'homework_destroy', :controller=>'bids', :course_id => bid.id},
|
||||
:method => :post,
|
||||
:data => {:confirm => l(:text_are_you_sure)},
|
||||
:class => 'icon icon-del'
|
||||
) if User.current.admin?||User.current.id==bid.author_id%></span></td>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width="500">
|
||||
<table border="0">
|
||||
|
||||
<tr>
|
||||
<td> <% if bid.reward_type.nil? or bid.reward_type == 1 %> <strong><%= l(:label_bids_reward_method) %><span style="color: #ed8924;font-family: 14px; font-family: 微软雅黑"><%= l(:label_call_bonus) %> <%= l(:label_RMB_sign) %><%= bid.budget%></span></strong> <% elsif bid.reward_type == 2 %> <strong><%= l(:label_bids_reward_method) %><span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= bid.budget%></span></strong> <% else %> <!-- <strong><%= l(:label_bids_reward_method) %><span style="color: #00aa83;font-family: 14px; font-family: 微软雅黑"><%= l(:label_bids_credit) %> <%= bid.budget%> <%= l(:label_bids_credit_number) %></span></strong> --> <% end %> <!-- <td style="color: rgb(255, 0, 0);"><strong><%= l(:label_price) %><%= l(:label_RMB_sign) %><%= bid.budget%></strong></td> --></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><span class="font_lighter">
|
||||
<% if bid.homework_type == 1%>
|
||||
<td><span class="font_lighter"> <% if bid.homework_type == 1%>
|
||||
<%= l(:label_x_homework_project, :count => bid.homeworks.count) %>(<strong><%= link_to bid.homeworks.count, project_for_bid_path(bid.id) %></strong>)
|
||||
<% else %><%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<strong><%= link_to bid.biding_projects.count, project_for_bid_path(bid.id) %></strong>)<% end %>
|
||||
|
||||
</span><span class="font_lighter"><%= l(:label_x_responses, :count => bid.commit) %>(<strong><%= link_to bid.commit, respond_path(bid) %></strong>)</span></td>
|
||||
<% else %><%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<strong><%= link_to bid.biding_projects.count, project_for_bid_path(bid.id) %></strong>)<% end %> </span><span class="font_lighter"><%= l(:label_x_responses, :count => bid.commit) %>(<strong><%= link_to bid.commit, respond_path(bid) %></strong>)</span></td>
|
||||
</tr>
|
||||
</table></td>
|
||||
<td width="200" align="right" class="a"><span class="font_lighter"> <%= format_time bid.created_on %></span></td>
|
||||
|
|
@ -50,5 +56,7 @@
|
|||
<% end %>
|
||||
|
||||
<% else %>
|
||||
<p class="font_description"><%= l(:label_my_create_honework_no_homework) %></p>
|
||||
<p class="font_description">
|
||||
<%= l(:label_my_create_honework_no_homework) %>
|
||||
</p>
|
||||
<% end %>
|
||||
|
|
@ -13,8 +13,7 @@
|
|||
<tr>
|
||||
<td colspan="2" valign="top"><strong><%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author), :class => 'bid_user') %>: <%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %>
|
||||
|
||||
<%= l(:label_course_homework) %> : <%= link_to(bid.courses.first.name, project_path(bid.courses.first)) %>
|
||||
</strong></td>
|
||||
<%= l(:label_course_homework) %> : <%= link_to(bid.courses.first.name, project_path(bid.courses.first)) %> </strong></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width="500">
|
||||
|
|
@ -23,11 +22,9 @@
|
|||
<td> <% if bid.reward_type.nil? or bid.reward_type == 1 %> <strong><%= l(:label_bids_reward_method) %><span style="color: #ed8924;font-family: 14px; font-family: 微软雅黑"><%= l(:label_call_bonus) %> <%= l(:label_RMB_sign) %><%= bid.budget%></span></strong> <% elsif bid.reward_type == 2 %> <strong><%= l(:label_bids_reward_method) %><span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= bid.budget%></span></strong> <% else %> <!-- <strong><%= l(:label_bids_reward_method) %><span style="color: #00aa83;font-family: 14px; font-family: 微软雅黑"><%= l(:label_bids_credit) %> <%= bid.budget%> <%= l(:label_bids_credit_number) %></span></strong> --> <% end %> <!-- <td style="color: rgb(255, 0, 0);"><strong><%= l(:label_price) %><%= l(:label_RMB_sign) %><%= bid.budget%></strong></td> --></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><span class="font_lighter">
|
||||
<% if bid.homework_type == 1%>
|
||||
<td><span class="font_lighter"> <% if bid.homework_type == 1%>
|
||||
<%= l(:label_x_homework_project, :count => bid.homeworks.count) %>(<strong><%= link_to bid.homeworks.count, project_for_bid_path(bid.id) %></strong>)
|
||||
<% else %><%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<strong><%= link_to bid.biding_projects.count, project_for_bid_path(bid.id) %></strong>)<% end %>
|
||||
</span><span class="font_lighter"><%= l(:label_x_responses, :count => bid.commit) %>(<strong><%= link_to bid.commit, respond_path(bid) %></strong>)</span></td>
|
||||
<% else %><%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<strong><%= link_to bid.biding_projects.count, project_for_bid_path(bid.id) %></strong>)<% end %> </span><span class="font_lighter"><%= l(:label_x_responses, :count => bid.commit) %>(<strong><%= link_to bid.commit, respond_path(bid) %></strong>)
|
||||
</tr>
|
||||
</table></td>
|
||||
<td width="200" align="right" class="a"><span class="font_lighter"> <%= format_time bid.created_on %></span></td>
|
||||
|
|
@ -50,5 +47,7 @@
|
|||
<% end %>
|
||||
|
||||
<% else %>
|
||||
<p class="font_description"><%= l(:label_my_honework_no_homework) %></p>
|
||||
<p class="font_description">
|
||||
<%= l(:label_my_honework_no_homework) %>
|
||||
</p>
|
||||
<% end %>
|
||||
|
|
@ -48,11 +48,11 @@
|
|||
<td align="right" >
|
||||
|
||||
<% if membership.roles.sort.collect(&:to_s).join(', ') =='Manager' %>
|
||||
Teacher
|
||||
老师
|
||||
<% elsif membership.roles.sort.collect(&:to_s).join(', ') =='Reporter' %>
|
||||
Student
|
||||
学生
|
||||
<% elsif membership.roles.sort.collect(&:to_s).join(', ') =='TA' %>
|
||||
TA
|
||||
助教
|
||||
<% end %>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -1,19 +1,8 @@
|
|||
<!-- added by fq -->
|
||||
<!--huang-->
|
||||
<%= user_course @state%>
|
||||
<% if @state == 0 %>
|
||||
<% if @user.user_extensions.identity == 0 %> <!-- for teacher-->
|
||||
<%= render :partial => 'my_course' %>
|
||||
<% else %> <!--for student-->
|
||||
<%= render :partial => 'my_joinedcourse' %>
|
||||
<% end %>
|
||||
<% elsif @state == 1 %>
|
||||
<% if @user.user_extensions.identity == 0 %>
|
||||
<%= render :partial => 'my_create_homework' %>
|
||||
<% else %>
|
||||
<%= render :partial => 'my_homework' %>
|
||||
<% end %>
|
||||
<% else @state == 2 %>
|
||||
<%= render :partial => 'my_joinedcourse' %>
|
||||
<% end %>
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,9 @@
|
|||
<!-- added by fq -->
|
||||
<!--huang-->
|
||||
<% if @user.user_extensions.identity == 0 %>
|
||||
<%= render :partial => 'my_create_homework' %>
|
||||
<% else %>
|
||||
<%= render :partial => 'my_homework' %>
|
||||
<% end %>
|
||||
|
||||
|
||||
|
|
@ -1489,6 +1489,7 @@ zh:
|
|||
label_welcome_trustie_description: 面向有创意和激情的高校大学生与创业者，提供社交化的项目管理、协同研究、软件开发和众包平台。
|
||||
label_user_project: 项目
|
||||
label_user_course: 课程
|
||||
label_user_homework: 作业
|
||||
label_bid_respond_quote: 回复
|
||||
label_bid_if_agreement: 如果喜欢我，请点击我
|
||||
label_bid_respond_delete: 删除
|
||||
|
|
@ -1497,6 +1498,7 @@ zh:
|
|||
label_newfeedback_delete: 删除
|
||||
label_user_all_activity: 所有动态
|
||||
label_user_activity_myself: 只看自己
|
||||
label_my_honework_no_homework: 暂无任何作业！
|
||||
label_user_all_respond: 所有反馈
|
||||
label_layouts_feedback: 留言
|
||||
label_welcome_participate: 参与了
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@ RedmineApp::Application.routes.draw do
|
|||
post 'boards/:board_id/topics/:id/replies', :to => 'messages#reply'
|
||||
post 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
|
||||
post 'boards/:board_id/topics/:id/destroy', :to => 'messages#destroy'
|
||||
post 'bids/homework_destroy', :to => 'bids#homework_destroy'
|
||||
|
||||
# Misc issue routes. TODO: move into resources
|
||||
match '/issues/auto_complete', :to => 'auto_completes#issues', :via => :get, :as => 'auto_complete_issues'
|
||||
|
|
@ -92,6 +93,7 @@ RedmineApp::Application.routes.draw do
|
|||
match 'user_watchlist', :to => 'users#user_watchlist', :via => :get, :as => "user_watchlist" #add by huang
|
||||
match 'user_fanslist', :to => 'users#user_fanslist', :via => :get, :as => "user_fanslist" #add by huang
|
||||
match 'user_courses', :to => 'users#user_courses', :via => :get
|
||||
match 'user_homeworks', :to => 'users#user_homeworks', :via => :get
|
||||
end
|
||||
end
|
||||
match 'users/:id/user_newfeedback', :to => 'users#user_newfeedback', :via => :get, :as => "feedback"
|
||||
|
|
|
|||
|
|
@ -330,8 +330,8 @@ end
|
|||
Redmine::MenuManager.map :user_menu do |menu|
|
||||
menu.push :activity, {:controller => 'users', :action => 'show' }
|
||||
menu.push :user_course, {:controller => 'users', :action => 'user_courses'}
|
||||
menu.push :user_homework, {:controller => 'users', :action => 'user_homeworks'}
|
||||
menu.push :user_project, {:controller => 'users', :action => 'user_projects'}
|
||||
|
||||
menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids'}
|
||||
menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback'}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue