Merge remote-tracking branch 'origin/szzh' into szzh

app/controllers/account_controller.rb

@@ -111,8 +111,7 @@ class AccountController < ApplicationController
       user_params = params[:user] || {}
       @user = User.new
       @user.safe_attributes = user_params
-      #这里判断 
-      if params[:identity] == "2"
+      if params[:identity] == "2" #   2 企业
         @user.firstname = params[:enterprise_name]
         @user.lastname = l(:field_enterprise)
       end
@@ -132,16 +131,6 @@ class AccountController < ApplicationController
         @user.login = params[:user][:login]
         unless user_params[:identity_url].present? && user_params[:password].blank? && user_params[:password_confirmation].blank?
           @user.password, @user.password_confirmation = user_params[:password], user_params[:password_confirmation]
-          # system "htpasswd -mb "+@root_path+"user.passwd "+params[:user][:login]+" "+user_params[:password]
-          # system "echo -e '\n"+params[:user][:login]+"-write:"+
-                 # " "+params[:user][:login]+"'  >> "+@root_path+"group.passwd"
-          # system "mkdir "+@root_path+"htdocs/"+params[:user][:login]
-# 
-          # system "echo -e 'Allow from all \n Order Deny,Allow \n "+
-                 # "<Limit PUT POST DELETE PROPPATCH MKCOL COPY MOVE LOCK UNLOCK> \n"+
-                 # "Require group "+params[:user][:login]+"-write  \n "+
-                 # "</Limit> \n ' >>"+
-                 # @root_path+"htdocs/"+params[:user][:login]+"/.htaccess"
         end
 
         case Setting.self_registration
@@ -183,6 +172,33 @@ class AccountController < ApplicationController
     redirect_to signin_path
   end
 
+  def valid_ajax
+    req = Hash.new(false)
+    req[:message] = ''
+
+    valid_attr = params[:valid]
+    valid_value = params[:value]
+
+    faker = User.new
+
+    if valid_attr.eql?('login')
+      faker.login = valid_value
+      faker.valid?
+      req[:valid] = faker.errors[:login].blank?
+      req[:message] = faker.errors[:login]
+    end
+
+    if valid_attr.eql?('mail')
+      faker.mail = valid_value
+      faker.valid?
+      req[:valid] = faker.errors[:mail].blank?
+      req[:message] = faker.errors[:mail]
+    end
+
+    req[:message] = l(:modal_valid_passing) if req[:message].blank?
+    render :json => req
+  end
+
   private
 
   def authenticate_user

app/controllers/attachment_type_edit_controller.rb

@@ -1,6 +0,0 @@
-  #资源类型编辑control
-class AttachmentTypeEditController < ApplicationController
-  def index
-
-  end
-end

app/controllers/attachments_controller.rb

@@ -62,6 +62,17 @@ class AttachmentsController < ApplicationController
     end
   end
 
+  #更新资源文件类型
+  def updateType
+    @attachment = Attachment.find(params[:attachmentid])
+    if  @attachment != nil
+      @attachment.attachtype =  params[:newtype]
+      @attachment.save
+      render :text =>'success'
+    else
+      render :text=>'error'
+    end
+  end
 
   def thumbnail
     if @attachment.thumbnailable? && thumbnail = @attachment.thumbnail(:size => params[:size])

app/controllers/bids_controller.rb

@@ -7,7 +7,7 @@ class BidsController < ApplicationController
   menu_item :homework_respond, :only => :homework_respond
   menu_item :homework_statistics, :only => :homework_statistics
   #Ended by young
-  before_filter :find_bid, :only => [:show, :show_project, :create,:destroy,:more,:back,:add,:new,:show_results,:set_reward, :add_homework, :fork, :create_fork,
+  before_filter :find_bid, :only => [:show, :show_project, :create,:destroy,:more,:back,:add,:delete,:new,:show_results,:set_reward, :add_homework, :fork, :create_fork,
                 :show_course, :show_bid_project, :show_bid_user, :join_in_contest, :unjoin_in_contest, :new_join,:show_participator, :settings]
   # added by fq
   before_filter :require_login, :only => [:join_in_contest, :unjoin_in_contest]
@@ -500,6 +500,15 @@ class BidsController < ApplicationController
     end
   end
 
+  #删除已提交的项目作业（不删项目）
+  def delete
+    binding_project = params[:binding_project]
+    if BidingProject.delete(binding_project)
+      redirect_to project_for_bid_path
+    else
+      redirect_to 403;
+    end
+  end
   ## 新建留言
   def create
 
@@ -693,7 +702,10 @@ class BidsController < ApplicationController
       redirect_to respond_path(@bid)
     else
       @bid.safe_attributes = params[:bid]
-      render :action => 'new_bid'
+      @homework = @bid
+      @project = Project.find_by_id(params[:course_id])
+      @project_id = @project.id
+      render file: 'projects/new_homework', layout: 'base_courses'
     end
   end
   
@@ -715,14 +727,14 @@ class BidsController < ApplicationController
   
   def update
     @bid = Bid.find(params[:id])
-    @project = @bid.courses.first
+    @project = @bid.courses.first#Project.find(params[:course_id])
     if @bid.update_attributes(params[:bid])
       flash[:notice] = l(:label_update_homework_succeed)
       #@project = Project.find(params[:course_id])
       redirect_to project_homework_path(@project)
     else
       @bid.safe_attributes = params[:bid]
-      render :action => 'edit', :layout =>'base_courses' ,:bid_id=>@bid.id,:project_id =>@project
+      render :action => 'edit', :layout =>'base_courses'
     end
   end
 

app/controllers/contests_controller.rb

@@ -4,7 +4,8 @@ class ContestsController < ApplicationController
   menu_item :respond                
   menu_item :project, :only => :show_project
   menu_item :application, :only => :show_softapplication
-  before_filter :find_contest, :only => [:show_contest, :show_project, :show_softapplication, :create,:destroy,:more,:back,:add,:add_softapplication,:new,:show_results, :set_reward,
+  menu_item :attendingcontest, :only => :show_attendingcontest
+  before_filter :find_contest, :only => [:show_contest, :show_project, :show_softapplication, :show_attendingcontest, :create,:destroy,:more,:back,:add,:add_softapplication,:new,:show_results, :set_reward,
                 :show_contest_project, :show_contest_user, :join_in_contest, :unjoin_in_contest, :new_join,:show_participator, :settings]
               
   # added by fq
@@ -252,6 +253,7 @@ class ContestsController < ApplicationController
   ############
   ##显示参赛的应用
   def show_softapplication
+    
     # @membership = User.current.memberships.all(:conditions => Project.visible_condition(User.current))
     # @option = []  
 
@@ -288,6 +290,66 @@ class ContestsController < ApplicationController
     end
   end
  
+ 
+ ###我要参赛
+ def show_attendingcontest
+##取出参赛项目
+    @membership = User.current.memberships.all(:conditions => Project.visible_condition(User.current))
+    @option = []
+    # @contesting_project_count = @contesting_project_all.count
+    # @contesting_project_pages = Paginator.new @contesting_project_count, per_page_option, params['page']
+    @membership.each do |membership|
+      unless(membership.project.project_type==1)
+        membership.member_roles.each{|role|
+          if(role.role_id == 3)
+          @option << membership.project
+          end
+        }
+      end
+    end
+    @user = @contest.author
+    @contesting_project = @contest.contesting_projects.all
+    if params[:student_id].present?
+      @temp = []
+      @contesting_project.each do |pro|
+        if pro.project && pro.project.project_status
+          if /#{params[:student_id]}/ =~  pro.user.user_extensions.student_id
+            @temp << pro
+          end
+        end
+        @temp
+      end
+      @contesting_project = @temp
+    else
+  
+      @temp = []
+      @contesting_project.each do |pro|
+        if pro.project && pro.project.project_status
+          @temp << pro
+        end
+        @temp
+      end
+      if @temp.size > 0
+          @contesting_project = @temp.sort {|a,b| b.project.project_status.grade <=> a.project.project_status.grade}
+      end
+    end
+##取出参赛应用   
+    @softapplication = Softapplication.all 
+    @contesting_softapplication = @contest.contesting_softapplications.reverse
+    @contesting_softapplication = paginateHelper  @contesting_softapplication, 10
+    
+    
+##引用base_newcontest整体样式
+    @contest = Contest.find_by_id(params[:id])
+    respond_to do |format|
+      format.html {
+        render :layout => 'base_newcontest'
+      }     
+      format.api
+    end  
+ end
+ 
+ ###end
   ###添加已创建的参赛项目
   def add
     project = Project.find(params[:contest])
@@ -500,9 +562,9 @@ class ContestsController < ApplicationController
       @contest = Contest.find(params[:id])
       @user = @contest.author
     end
-  rescue
+    rescue
     render_404
-    end
+  end
 
 end
 

app/controllers/memos_controller.rb

@@ -94,7 +94,7 @@ class MemosController < ApplicationController
     @reply_pages = Paginator.new @reply_count, pre_count, page
     @replies = @memo.children.
                 includes(:author, :attachments).
-                reorder("#{Memo.table_name}.created_at ASC").
+                reorder("#{Memo.table_name}.created_at DESC").
                 limit(@reply_pages.per_page).
                 offset(@reply_pages.offset).
                 all

app/controllers/messages_controller.rb

@@ -43,7 +43,7 @@ class MessagesController < ApplicationController
     @reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page
     @replies =  @topic.children.
       includes(:author, :attachments, {:board => :project}).
-      reorder("#{Message.table_name}.created_on ASC").
+      reorder("#{Message.table_name}.created_on DESC").
       limit(@reply_pages.per_page).
       offset(@reply_pages.offset).
       all

app/controllers/projects_controller.rb

@@ -295,8 +295,12 @@ class ProjectsController < ApplicationController
     project_type = params[:project_type].to_i
     projects_all = (project_type.eql? Project::ProjectType_course) ? Project.course_entities : Project.project_entities
     @projects = projects_all.visible
-    @projects_all = @projects.visible.like(params[:name]) if params[:name].present? 
-
+    #@projects_all = @projects.visible.like(params[:name]) if params[:name].present?
+    if params[:name].present?
+      @projects_all = @projects.visible.like(params[:name])
+    else
+      @projects_all =  @projects;
+    end
         @project_count = @projects_all.count
     @project_pages = Paginator.new @project_count, per_page_option, params['page']
     
@@ -808,6 +812,8 @@ class ProjectsController < ApplicationController
     @render_file = 'member_list'
     # 判断是否课程
     if @project.project_type == Project::ProjectType_course
+      @teachers= searchTeacherAndAssistant(@project)
+      @canShowCode = isCourseTeacher(User.current.id)
       case params[:role]
       when '1'
         @subPage_title = l :label_teacher_list
@@ -829,6 +835,15 @@ class ProjectsController < ApplicationController
     render :layout => 'base_courses' if @project.project_type == 1
   end
 
+  #判断指定用户是否为课程教师
+  def isCourseTeacher(id)
+     result = false
+    if  @teachers.find_by_user_id(id) != nil
+      result = true
+    end
+    result
+  end
+
   def sort_project_members project, members
     #userGrade = UserGrade.where(:project_id => project.id)
     users = UserGrade.where(:project_id => project.id).

app/controllers/school_controller.rb

@@ -47,7 +47,26 @@ class SchoolController < ApplicationController
       options << "<option value = '#{p.province}' >#{p.province}</option>"
     end
 
-    render :text => options
+    # 取id取学校名
+    # 连接子表: 查询已添加用户的学校
+    school = School.select("id, name").
+              joins("RIGHT JOIN (
+                      SELECT DISTINCT school_id 
+                      FROM #{UserExtensions.table_name} 
+                      WHERE school_id IS NOT NULL) AS sids ON schools.id = sids.school_id").
+              where("#{School.table_name}.id IS NOT NULL")
+
+    options_s = ""
+    school.each do |s|
+      options_s << "<li style = 'width: 33%; float: left'><a id=#{s.id} onclick='test(this.id, this.text)'>#{s.name}</a></li>"
+    end
+
+    res = Hash.new
+    res[:text] = options
+    res[:text_s] = options_s
+
+    render :json => res
+
 
   end
   
@@ -79,8 +98,11 @@ class SchoolController < ApplicationController
   end
   
   def search_school
-    @school = School.where("province = ? AND name LIKE '%"+params[:key_word]+"%'", params[:province]);
-    
+    if params[:province].nil? or params[:province] == "0"
+      @school = School.where("name LIKE '%"+params[:key_word]+"%'");
+    else  
+      @school = School.where("province = ? AND name LIKE '%"+params[:key_word]+"%'", params[:province]);
+    end
     options = ""
     @school.each do |s|
       options << "<li style = 'width: 33%; float: left'><a id=#{s.id} onclick='test(this.id)'>#{s.name}</a></li>"

app/controllers/softapplications_controller.rb

@@ -106,11 +106,13 @@ class SoftapplicationsController < ApplicationController
     @softapplication.save_attachments(params[:attachments])
     respond_to do |format|
       if @softapplication.save
+        format.js 
         format.html { redirect_to @softapplication, notice: 'Softapplication was successfully created.' }
-        format.json { render json: @softapplication, status: :created, location: @softapplication }
+        # format.json { render json: @softapplication, status: :created, location: @softapplication }
       else
+        format.js { render status: 406 }
         format.html { render action: "new" }
-        format.json { render json: @softapplication.errors, status: :unprocessable_entity }
+        # format.json { render json: @softapplication.errors, status: :unprocessable_entity }
       end
     end
   end

app/controllers/users_controller.rb

@@ -38,6 +38,7 @@ class UsersController < ApplicationController
                                   :user_homeworks, :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments, 
                                   :watch_bids, :watch_contests, :info, :watch_projects, :show_score, :topic_score_index, :project_score_index, 
                                   :activity_score_index, :influence_score_index, :score_index]
+  before_filter :auth_user_extension, only: :show
   accept_api_auth :index, :show, :create, :update, :destroy,:tag_save
   
   #william
@@ -548,6 +549,14 @@ class UsersController < ApplicationController
         format.api  { render_validation_errors(@user) }
       end
     end
+
+    unless @user.id.nil?
+      #后台注册的用户默认权限为男性开发员
+      ue = UserExtensions.create(:identity => 3,
+                                  :gender => 0,
+                                 :user_id => @user.id)
+      ue.save
+    end
   end
 
   def edit
@@ -735,4 +744,12 @@ class UsersController < ApplicationController
   def setting_layout(default_base='base_users')
     User.current.admin? ? 'base_admin' : default_base 
   end
+
+  # 必填自己的工作单位，其实就是学校
+  def auth_user_extension
+    if @user == User.current && @user.user_extensions.school.nil?
+      flash[:error] = l(:error_complete_occupation)
+      redirect_to my_account_path
+    end
+  end
 end

app/helpers/application_helper.rb

@@ -390,6 +390,16 @@ module ApplicationHelper
     s.html_safe
   end
 
+  #扩展的checkbox生成
+  def principals_check_box_tags_ex(name, principals)
+    s = ''
+    principals.each do |principal|
+      s << "<label>#{ check_box_tag name, principal.id, false, :id => nil } #{h principal.userInfo }</label>\n"
+    end
+    s.html_safe
+  end
+
+
   # Returns a string for users/groups option tags
   def principals_options_for_select(collection, selected=nil)
     s = ''

app/helpers/files_helper.rb

@@ -55,9 +55,9 @@ module FilesHelper
       result = true
     end
     if  result
-      if    contentType != l(:attachment_all) && contentType != attachment.suffix_type
+      if contentType != '0' && contentType != attachment.suffix_type
         result = false
-         end
+      end
     end
     result
   end

app/helpers/members_helper.rb

@@ -24,7 +24,7 @@ module MembersHelper
     principal_pages = Redmine::Pagination::Paginator.new principal_count, 10, params['page'] #by young
     principals = scope.offset(principal_pages.offset).limit(principal_pages.per_page).all
 
-    s = content_tag('div', principals_check_box_tags('membership[user_ids][]', principals), :id => 'principals')
+    s = content_tag('div', principals_check_box_tags_ex('membership[user_ids][]', principals), :id => 'principals')
 
     links = pagination_links_full(principal_pages, principal_count, :per_page_links => false) {|text, parameters, options|
       link_to text, autocomplete_project_memberships_path(project, parameters.merge(:q => params[:q], :format => 'js')), :remote => true

app/models/attachment.rb

@@ -285,6 +285,7 @@ class Attachment < ActiveRecord::Base
     result
   end
 
+
   def self.attach_filesex(obj, attachments,attachment_type)
     result = obj.save_attachmentsex(attachments, User.current,attachment_type)
     obj.attach_saved_attachments

app/models/attachmentstype.rb

@@ -3,7 +3,7 @@ class Attachmentstype < ActiveRecord::Base
   has_many  :attachments,  :foreign_key => "attachtype",:primary_key => "id"
 
   # 当前使用的文件内容分类列表
-  @@SuffixArr = ['pdf','zip','doc','docx','rar','txt','jpg','bmp','xls','xlsx']
+  @@SuffixArr = ['pdf','zip','doc','docx','ppt','pptx','rar','txt','jpg','bmp','xls','xlsx']
 
   def suffixArr
     @@SuffixArr

app/models/issue.rb

@@ -991,6 +991,11 @@ class Issue < ActiveRecord::Base
     "#{tracker} ##{id}: #{subject}"
   end
 
+  # 缺陷在项目中的序号
+  def inProjectIndex
+    (self.project.issues.index(self).to_i + 1).to_s
+  end
+
   # Returns a string of css classes that apply to the issue
   def css_classes
     s = "issue tracker-#{tracker_id} status-#{status_id} #{priority.try(:css_classes)}"

app/models/journal.rb

@@ -29,8 +29,8 @@ class Journal < ActiveRecord::Base
   # end
   attr_accessor :indice
 
-  acts_as_event :title => Proc.new {|o| status = ((s = o.new_status) ? " (#{s})" : nil); "#{o.issue.tracker} ##{o.issue.id}#{status}: #{o.issue.subject}" },
-                :description => :notes,
+  acts_as_event :title =>Proc.new {|o| status = ((s = o.new_status) ? " (#{s})" : nil); "#{o.issue.tracker} ##{o.issue.inProjectIndex}#{status}: #{o.issue.subject}" },
+                :description =>:notes,
                 :author => :user,
                 :group => :issue,
                 :type => Proc.new {|o| (s = o.new_status) ? (s.is_closed? ? 'issue-closed' : 'issue-edit') : 'issue-note' },

app/models/school.rb

@@ -1,4 +1,8 @@
 class School < ActiveRecord::Base
   attr_accessible :name, :province
   has_many :courses
+
+  def to_s
+  	self.name.to_s
+  end
 end

app/models/user.rb

@@ -191,6 +191,10 @@ class User < Principal
     end
   }
 
+  #选择项目成员时显示的用户信息文字
+  def userInfo
+   info=self.name + '   (' + self.login + ')';
+  end
   
    ###添加留言   fq
   def add_jour(user, notes, reference_user_id = 0, options = {})

app/views/account/register.html.erb

@@ -278,7 +278,7 @@
 
 
 <% if @user.auth_source_id.nil? %>
-  <p><%= f.text_field :login, :size => 25, :required => true %>
+  <p><%= f.text_field :login, :size => 25, :required => true %><span id="valid_user_login"></span>
   	<em class="info"><%= l(:label_max_number) %></em></p> 
   <p><%= f.password_field :password, :size => 25, :required => true %>
   <em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
@@ -294,7 +294,7 @@
 	          <td class="info" style="width: 10px">
 	          	<%= text_field_tag :enterprise_name %></td></tr></table></p>
 </span>
-<p><%= f.text_field :mail, :required => true %></p>
+<p><%= f.text_field :mail, :required => true %><span id="valid_user_mail"></span></p>
 <p>
 	<em class="info"><%="#{l(:label_mail_attention)} "%></em></p>
 <p><%= f.select :language, lang_options_for_select , :required => true %></p>
@@ -368,3 +368,36 @@
 
 
 
+<script type="text/javascript">
+var $login = $('#user_login')
+var $mail = $('#user_mail')
+
+jQuery(document).ready(function() {
+    $login.blur(function(event) {
+        var $parent = $(this).parent();
+        if ( $(this).is('#user_login')) {
+            $.get('<%=account_valid_ajax_path%>?valid=login&value='+this.value, function(data) {
+                if (data.valid) {
+                    $('#valid_user_login').html('<span class="green">'+data.message+"</span>");
+                }else{
+                    $('#valid_user_login').html('<span class="red">'+data.message+"</span>");
+                }
+            });
+        };
+    });
+
+    $mail.blur(function(event) {
+        var $parent = $(this).parent();
+        if ( $(this).is('#user_mail')) {
+            $.get('<%=account_valid_ajax_path%>?valid=mail&value='+this.value, function(data) {
+                if (data.valid) {
+                    $('#valid_user_mail').html('<span class="green">'+data.message+"</span>");
+                }else{
+                    $('#valid_user_mail').html('<span class="red">'+data.message+"</span>");
+                }
+            });
+        };
+    });
+});
+
+</script>

app/views/attachments/_type_edit.html.erb

@@ -0,0 +1,14 @@
+<% edit_allowed = User.current.allowed_to?(:manage_files, @project) %>
+<% if attachmenttypes.any? %>
+    <div id="put-tag-form-<%=attachment.id%>" class="hidden">
+        <%= select_tag "attachment_type",
+                       options_from_collection_for_select(attachmenttypes, "id",
+                         "typeName",attachment.attachtype), :onchange=>"attachmenttypes_change("+attachment.id.to_s + ",this.value)"%>
+      </div>
+    <%= link_to(image_tag('edit/edit.png'), 'javascript:void(0);',:style=>"white-space:nowrap;", :id=>"edit_box"+attachment.id.to_s ,
+                :onclick =>"$('#put-tag-form-" +attachment.id.to_s+ "').show();
+                $('#attach_type_id_label" +attachment.id.to_s+ "').hide();
+                $('#edit_box" +attachment.id.to_s+ "').hide();") if edit_allowed %>
+
+<% end %>
+

app/views/bids/_bid_homework_show.html.erb

@@ -13,9 +13,11 @@
 						<span class="font_lighter"><%= l(:label_user_create_project_homework) %></span>
 					<span><%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %></span>
 					<span style="float: right">
+                        <% if(User.current.logged? && (!Member.where('user_id = ? and project_id = ?', User.current.id, bid.courses.first.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, bid.courses.first.id).first.roles&Role.where('id = ? or id = ? or id =?',5, 10, 7)).size >0)) %>
 						<%# 提交作业按钮 %>
 						<%= link_to  l(:label_commit_homework), '#OpenWindow', rel: 'leanModal', onclick: "showSubH(#{bid.id}, '#{bid.name}');" if User.current.member_of?(@project) %>
-						<% if (User.current.admin?||User.current.id==bid.author_id) %>
+						<% end %>
+                        <% if (User.current.admin?||User.current.id==bid.author_id) %>
 						<%= link_to(
           					l(:button_edit),
           					{:action => 'edit', :controller=>'bids', :project_id =>@project.id, :bid_id => bid.id},
@@ -33,10 +35,19 @@
 			</tr>
 				<tr>
 						<td colspan="2"><span class="font_lighter">
+                          <%  @bidding_project = bid.biding_projects.all
+                              @temp = []
+                              @bidding_project.each do |pro|
+                                if pro.project && pro.project.project_status
+                                  @temp << pro
+                                end
+                                @temp
+                             end
+                          %>
 						<% 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>)
+							<%= l(:label_x_homework_project, :count => @temp.count) %>(<strong><%= link_to @temp.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>
 				<span style="float: right">

app/views/bids/_list_projects.html.erb

@@ -148,11 +148,17 @@
 						</span></td>
 					</tr>
 					<tr>
-						<td>
+						<td colspan="2">
 						<% if Time.parse(@bid.deadline.to_s) < Time.parse(b_project.created_at.to_s) %>
 							<span class="required">迟交</span>
 						<% end %>
 						</td>
+                        <td align="right">
+                          <% if  b_project.user.id == User.current.id || User.current.id == b_project.bid.author.id
+                          %>
+                            <%= link_to image_tag('delete.png'),{ :action => "delete",  :binding_project => b_project}, :confirm => "Are you sure?"  %>
+                          <% end %>
+                        </td>
 					</tr>
 				</table>
 				</td>