1.添加作业时权限判断

2.增加作业成员tab页

app/controllers/homework_attach_controller.rb

@@ -20,6 +20,7 @@ class HomeworkAttachController < ApplicationController
   def create
     bid = Bid.find params[:bid_id]
     if User.current.admin? || User.current.member_of?(bid.courses.first)
+      if bid.homeworks.where("user_id = ?",User.current).count == 0
         user_id = params[:user_id]
         bid_id = params[:bid_id]
         sta = 0
@@ -49,7 +50,10 @@ class HomeworkAttachController < ApplicationController
           render_403 :message => :notice_not_authorized
         end
       else
-
+        render_403 :message => :notice_has_homework
+      end
+    else
+      render_403 :message => :notice_not_authorized
     end
   end
 

app/helpers/homework_attach_helper.rb

@@ -1,10 +1,34 @@
 module HomeworkAttachHelper
+  #判断是否具有删除的权限
   def attach_delete(project)
     if User.current.logged? && (User.current.admin? || (!Member.where('user_id = ? and project_id = ?', User.current.id, project.bid.courses.first.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, project.bid.courses.first.id).first.roles&Role.where('id = ? or id = ?', 3, 7)).size >0) || project.user_id == User.current.id)
       true
     else
       false
     end
+  end
+  #作业添加、编辑界面的tab页
+  def homework_settings_tabs f
+    @project = Project.find 205
+    @f = f
+    tabs = [{:name => 'info', :action => :edit_homework, :partial => 'homework_attach/edit_homework', :label => :label_information_plural},
+            {:name => 'members', :action => :homework_member, :partial => 'homework_attach/homework_member', :label => :label_member_plural}
+    ]
+    #tabs.select {|tab| User.current.allowed_to?(tab[:action], @homework)}
+  end
 
+  def render_principals_for_new_members(project)
+    scope = Principal.active.sorted.not_member_of(project).like(params[:q])
+    principal_count = scope.count
+    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_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
+    }
+
+    s + content_tag('div', content_tag('ul', links), :class => 'pagination_new')
   end
 end

app/helpers/projects_helper.rb

@@ -150,7 +150,6 @@ module ProjectsHelper
             {:name => 'members', :action => :manage_members, :partial => 'projects/settings/members', :label => :label_member_plural}
             ]
     tabs.select {|tab| User.current.allowed_to?(tab[:action], @project)}
-    
   end
   #Ended by young
   

app/views/homework_attach/_edit_homework.html.erb

@@ -0,0 +1,23 @@
+<div class="box">
+
+      <p style=" padding: 3px 0 3px 0;padding-left: 50px;  clear:left;">
+        <strong>标  题：</strong>
+        <%= @f.text_field "name", :required => true, :size => 60, :style => "width:490px;" %>
+      </p>
+      <p style=" padding: 3px 0 3px 0;padding-left: 50px;  clear:left;">
+        <strong  style="vertical-align: top">描  述：</strong>
+        <span style="margin-left:-10px;padding-right: 20px;">
+          <%= @f.text_area "description", :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %>
+        </span>
+      </p>
+      <p style="padding-left: 60px">
+          <fieldset style="text-align: left;">
+            <legend>
+              <%= l(:label_attachment_plural) %>
+            </legend>
+            <p style=" padding: 3px 0 3px 0;padding-left: 50px;  clear:left;">
+              <%= render :partial => 'attachments/form' %>
+            </p>
+          </fieldset>
+      </p>
+</div>

app/views/homework_attach/_homework_member.html.erb

@@ -0,0 +1,131 @@
+<%= error_messages_for 'member' %>
+<%
+   roles = Role.givable.all
+   if @project.project_type == Project::ProjectType_course
+     roles = roles[3..5]
+   else
+     roles = roles[0..2]
+   end
+   members = @project.member_principals.includes(:roles, :principal).all.sort
+%>
+
+<div class="splitcontentleft">
+  <% if members.any? %>
+      <table class="list members">
+        <thead>
+        <tr>
+          <th><%= l(:label_user) %></th>
+          <th><%= l(:label_role_plural) %></th>
+          <th style="width:15%"></th>
+          <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
+        </tr>
+        </thead>
+        <tbody>
+        <% members.each do |member| %>
+            <% next if member.new_record? %>
+            <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
+              <td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
+              <td class="roles">
+    <span id="member-<%= member.id %>-roles">
+      <%= h member.roles.sort.collect(&:to_s).join(', ') %>
+    </span>
+                <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
+                                      :method => :put,
+                                      :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}}
+                    ) do |f| %>
+
+                    <p>
+                      <% roles.each do |role| %>
+                          <label><%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role),
+                                                   :disabled => member.member_roles.detect { |mr| mr.role_id == role.id && !mr.inherited_from.nil? } %> <%= h role %></label><br/>
+                      <% end %></p>
+                    <%= hidden_field_tag 'membership[role_ids][]', '' %>
+                    <p><%= submit_tag l(:button_change), :class => "small" %>
+                      <%= link_to_function l(:button_cancel),
+                                           "$('#member-#{member.id}-roles').show(); $('#member-#{member.id}-roles-form').hide(); return false;"
+                      %></p>
+                <% end %>
+              </td>
+              <!--modified by huang for: if the user'roles is Manager that he will can't modified himself-->
+              <% if @project.project_type == 1 %>
+                  <% if member.roles.first.to_s == "Manager" %>
+                      <td class="buttons"></td>
+                  <% else %>
+                      <td class="buttons">
+                        <%= link_to_function l(:button_edit),
+                                             "$('#member-#{member.id}-roles').hide(); $('#member-#{member.id}-roles-form').show(); return false;",
+                                             :class => 'icon icon-edit' %>
+                        <%= delete_link membership_path(member),
+                                        :remote => true,
+                                        :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %>
+                      </td>
+                  <% end %>
+              <% else %>
+                  <td class="buttons">
+                    <%= link_to_function l(:button_edit),
+                                         "$('#member-#{member.id}-roles').hide(); $('#member-#{member.id}-roles-form').show(); return false;",
+                                         :class => 'icon icon-edit' %>
+                    <%= delete_link membership_path(member),
+                                    :remote => true,
+                                    :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %>
+                  </td>
+              <% end %>
+              <!--end-->
+              <%= call_hook(:view_projects_settings_members_table_row, {:project => @project, :member => member}) %>
+            </tr>
+        <% end; reset_cycle %>
+        </tbody>
+      </table>
+  <% else %>
+      <p class="nodata"><%= l(:label_no_data) %></p>
+  <% end %>
+</div>
+
+<div class="splitcontentright">
+  <% if roles.any? %>
+      <% if @project.applied_projects.any? %>
+          <div id="applied_project_block">
+            <%= form_for(@applied_members, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
+                <fieldset>
+                  <legend><%= l(:label_apply_project) %></legend>
+
+                  <div id="principals_for_applied_member">
+                    <%= render_principals_for_applied_members(@project) %>
+                  </div>
+                  <!--show the roles which will select-->
+                  <p style="padding-top: 5px"><%= l(:label_role_plural) %>:
+                    <% roles.each do |role| %>
+
+                        <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%= h role %></label>
+                    <% end %></p>
+
+                  <p><%= submit_tag l(:label_approve), :id => 'member-add-submit' %>
+                    <%= submit_tag l(:label_refusal), :name => "refusal_button", :id => 'member-refusal-submit' %>
+                  </p>
+                </fieldset>
+            <% end %>
+          </div>
+      <% end %>
+
+      <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
+          <fieldset>
+            <legend><%= l(:label_member_new) %></legend>
+
+            <p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p>
+            <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js') }')" %>
+
+            <div id="principals_for_new_member">
+              <%= render_principals_for_new_members(@project) %>
+            </div>
+            <!--show the roles which will select-->
+            <p style="padding-top: 5px"><%= l(:label_role_plural) %>:
+              <% roles.each do |role| %>
+
+                  <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%= h role %></label>
+              <% end %></p>
+
+            <p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
+          </fieldset>
+      <% end %>
+  <% end %>
+</div>

config/locales/zh.yml

@@ -176,6 +176,7 @@ zh:
   notice_file_not_found: 您访问的页面不存在或已被删除。
   notice_locking_conflict: 数据已被另一位用户更新
   notice_not_authorized: 对不起，您无权访问此页面。
+  notice_has_homework: 您已经提交过一份作业
   notice_not_contest_setting_authorized: 对不起，您无权配置此竞赛。
   notice_not_contest_delete_authorized: 对不起，您无权删除此竞赛。
   notice_not_authorized_archived_project: 要访问的项目已经归档。