From 56e5e55589fee6010c78695775e186bc1f55d850 Mon Sep 17 00:00:00 2001 From: baiyu Date: Wed, 2 Oct 2013 21:47:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86fork=E9=87=8C?= =?UTF-8?q?=E7=9A=84=E6=A0=BC=E5=BC=8F=E5=8F=8A=E8=8B=A5=E5=B9=B2=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=20=E4=BF=AE=E6=94=B9=E4=BA=86=E7=BB=99?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=95=99=E8=A8=80=E5=9B=9E=E5=A4=8D=E7=9A=84?= =?UTF-8?q?=E6=9D=83=E9=99=90=20=E9=9A=90=E8=97=8F=E4=BA=86=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E5=88=97=E8=A1=A8=E7=9A=84=E2=80=9C=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 2 +- app/controllers/test_controller.rb | 6 ++++++ app/controllers/users_controller.rb | 3 ++- app/helpers/projects_helper.rb | 1 + app/views/account/register.html.erb | 3 ++- app/views/bids/_bid_show.html.erb | 6 ++++++ app/views/bids/_fork_form.html.erb | 7 +++++-- app/views/bids/fork.html.erb | 2 +- app/views/bids/index.html.erb | 4 ++-- app/views/layouts/base_courses.html.erb | 13 ++++++++++++- app/views/layouts/base_users.html.erb | 2 +- app/views/projects/_project.html.erb | 12 ++++++++++++ app/views/projects/course.html.erb | 2 ++ app/views/users/_my_course.html.erb | 7 ++++++- config/locales/zh.yml | 5 +++++ config/routes.rb | 2 +- lib/redmine.rb | 3 ++- 17 files changed, 67 insertions(+), 13 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index babd06c28..80b2046ba 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -43,7 +43,7 @@ class ProjectsController < ApplicationController before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise] before_filter :authorize, :except => [:new_join, :new_homework, :homework, :statistics, :search, :watcherlist, :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy, :member, :focus, :file, - :statistics, :feedback, :course, :enterprise_course, :course_enterprise] + :statistics, :feedback, :course, :enterprise_course, :course_enterprise, :project_respond] before_filter :authorize_global, :only => [:new, :create] before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy, :calendar] #by young diff --git a/app/controllers/test_controller.rb b/app/controllers/test_controller.rb index e668a2343..46ae016ed 100644 --- a/app/controllers/test_controller.rb +++ b/app/controllers/test_controller.rb @@ -4,6 +4,12 @@ class TestController < ApplicationController def index + # @users = User.where('status = ?', 1) + # for user in @users + # if user.user_extensions.nil? + # UserExtensions.create(:user_id => user.id) + # end + # end # @message = Message.all # @message.each do |m| diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6857e8a11..f7a9442ee 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -54,7 +54,8 @@ class UsersController < ApplicationController helper :words #added by young def user_projects - @memberships = @user.memberships.all(:conditions => Project.visible_condition(User.current)) + cond = Project.visible_condition(User.current) + "AND projects.project_type <> 1" + @memberships = @user.memberships.all(:conditions => cond) events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 20) @events_by_day = events.group_by(&:event_date) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index b38d3497a..7e6760bc2 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -17,6 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +include AvatarHelper module ProjectsHelper def link_to_version(version, options = {}) return '' unless version && version.is_a?(Version) diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb index ce666940e..59184d697 100644 --- a/app/views/account/register.html.erb +++ b/app/views/account/register.html.erb @@ -218,7 +218,8 @@ <%= select_tag 'identity', " - ".html_safe %>

+ + ".html_safe %>

diff --git a/app/views/bids/_bid_show.html.erb b/app/views/bids/_bid_show.html.erb index 37946ed69..75b7ac846 100644 --- a/app/views/bids/_bid_show.html.erb +++ b/app/views/bids/_bid_show.html.erb @@ -23,6 +23,12 @@ + <% unless bid.courses.empty? %> + <% teacher = Course.find_by_extra(bid.courses.first.identifier).teacher %> + + + + <% end %> <% end %>
<%= l(:label_gender) %>
<%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<%= link_to bid.biding_projects.count, project_for_bid_path(bid) %>) <%= l(:label_x_responses, :count => bid.commit) %>(<%= link_to bid.commit, respond_path(bid) %>) <%= l(:label_x_followers, :count => bid.watcher_users.count) %>(<%= link_to bid.watcher_users.count, respond_path(bid) %>)
课程名称：<%= link_to bid.courses.first.name, project_path(bid.courses.first)%>  教师：<%= link_to teacher.lastname+teacher.firstname, user_path(teacher) %>
<%= format_time bid.created_on %> diff --git a/app/views/bids/_fork_form.html.erb b/app/views/bids/_fork_form.html.erb index c910a399a..1a454d9fe 100644 --- a/app/views/bids/_fork_form.html.erb +++ b/app/views/bids/_fork_form.html.erb @@ -1,9 +1,12 @@ - + <%= error_messages_for 'bid' %>

<%= l(:label_homeworks_form_new_description) %>

-

选择课程<%= select_tag 'course', course_options_for_select(@courses) %>

+ + +

<%= l(:label_choose_course) %> * <%= select_tag 'course', course_options_for_select(@courses) %>

<%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;", :maxlength => Bid::NAME_LENGTH_LIMIT, :value => @bid.name %>

+

<%= f.text_area :description, :rows => 8, :value => @bid.description, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;", :maxlength => Bid::DESCRIPTION_LENGTH_LIMIT %>

diff --git a/app/views/bids/fork.html.erb b/app/views/bids/fork.html.erb index 592e71386..5d9192c83 100644 --- a/app/views/bids/fork.html.erb +++ b/app/views/bids/fork.html.erb @@ -1,5 +1,5 @@ -

<%=l(:label_new_call)%>

+

<%=l(:label_course_homework_new)%>

<%= labelled_form_for @bid, :url => {:controller => 'bids', :action => 'create_fork', :id => @bid.id} do |f| %>
diff --git a/app/views/bids/index.html.erb b/app/views/bids/index.html.erb index d7bb4c6af..25208b824 100644 --- a/app/views/bids/index.html.erb +++ b/app/views/bids/index.html.erb @@ -12,9 +12,9 @@ <% if User.current.logged? %> - + <% unless @project_type == '1' %> <%= link_to(l(:label_new_call), {:controller => 'bids', :action => 'new_bid'}, :class => 'icon icon-add') %> - + <% end %> <% end %> diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 164c31fa4..965f1dd0e 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -38,7 +38,18 @@ <% @course = Course.find_by_extra(@project.identifier)%> - + - + <% end %> + <% end %>
<%= link_to image_tag(url_to_avatar(@project), :class => 'avatar2') %> + <% if(@project.project_type==1)%> + + <% if get_avatar?(@project)%> + <%= link_to image_tag(url_to_avatar(@project), :class => "avatar2"), project_path(@project) %> + <% else %> + <%= link_to image_tag('../images/avatars/Project/course.jpg', :class => "avatar2"), project_path(@project)%> + <% end %> + <% else %> + <%= link_to image_tag(url_to_avatar(@project), :class => "avatar2") %> + <% end %> +
<%= @project.name %> diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index f16eb7352..009b40d5e 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -122,7 +122,7 @@
<%= l(:field_occupation) %>:<%= @user.user_extensions.occupation %>
<%= l(:label_location) %>:<%= @user.user_extensions.location %><%= l(:label_location) %>:<%= @user.user_extensions.location %><%= @user.user_extensions.location_city %>
diff --git a/app/views/projects/_project.html.erb b/app/views/projects/_project.html.erb index fbb0c5cad..619e96985 100644 --- a/app/views/projects/_project.html.erb +++ b/app/views/projects/_project.html.erb @@ -1,7 +1,15 @@
+ <% if(@project.project_type==1)%> + <% if get_avatar?(project)%> + <%= link_to image_tag(url_to_avatar(project), :class => "avatar2"), project_path(project) %> + <% else %> + <%= link_to image_tag('../images/avatars/Project/course.jpg', :class => "avatar2"), project_path(project)%> + <% end %> + <% else %> <%=link_to image_tag(url_to_avatar(project), :class => "avatar2"), project_path(project) %> + <% end %>

@@ -39,6 +47,10 @@ <% if @admin.size > 0 %> <%= content_tag('a', @admin.collect{|u| link_to(u.user.name, user_path(u.user_id))}.join(", ").html_safe) %> <% end %> + <% if(@project.project_type==1)%> +    大学： + <%= @admin.first.user.user_extensions.occupation %> + <% end %>

<%= content_tag('span', "#{l(:label_create_time)}: ") %><%= content_tag('span', format_time(@project.created_on)) %> diff --git a/app/views/projects/course.html.erb b/app/views/projects/course.html.erb index dce1d7159..30af28499 100644 --- a/app/views/projects/course.html.erb +++ b/app/views/projects/course.html.erb @@ -8,9 +8,11 @@
<%= l(:label_new_course)%> + <% if User.current.logged?%> <% if User.current.user_extensions.identity == 0 %> <%= link_to(l(:label_course_new), {:controller => 'projects', :action => 'new', :course => 1, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>
<%= text_field_tag 'name', params[:name], :size => 30 %> diff --git a/app/views/users/_my_course.html.erb b/app/views/users/_my_course.html.erb index 225ae1273..3b2c6fa7a 100644 --- a/app/views/users/_my_course.html.erb +++ b/app/views/users/_my_course.html.erb @@ -6,11 +6,16 @@

<% else %>

- <%= l(:label_project_course_unadd) %><%= link_to"#{l(:label_course_new)}",{:controller=>'projects',:action=>'new', :course => 1}, :class => 'icon icon-add' %> + <%= l(:label_project_course_unadd) %> + <% if User.current.user_extensions.identity == 0 %> + <%= link_to"#{l(:label_course_new)}",{:controller=>'projects',:action=>'new', :course => 1}, :class => 'icon icon-add' %> + <% end %>

<% end %> <% else %> + <% if User.current.user_extensions.identity == 0 %> <%= link_to"#{l(:label_course_new)}",{:controller=>'projects',:action=>'new', :course => 1}, :class => 'icon icon-add' %> + <% end %>
    <% for membership in @memberships %>
  • diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 8ea28d4e8..f0eadd6e4 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1508,6 +1508,8 @@ zh: label_teacher_homework: 教师姓名 label_student: 学生 label_other: 其他 + label_enterprise: 企业 + label_developer: 开发者 label_gender: 性别 label_gender_male: 男 label_gender_female: 女 @@ -1519,6 +1521,9 @@ zh: label_main_term: 课程学期 label_teacher_work_unit: 教师单位 label_course_time: 课程年度 + label_i_new_activity: 有了新活动在 + label_choose_course: 选择课程 + #end label_course: 课程 diff --git a/config/routes.rb b/config/routes.rb index be47ebba5..a21e9d65e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -466,7 +466,7 @@ RedmineApp::Application.routes.draw do match 'calls/:id/set_reward',:controller => 'bids',:action => 'set_reward',:as => 'set_reward' ## 测试用 - # match 'test/index', :controller => 'test', :action => 'index' + match 'test/index', :controller => 'test', :action => 'index' # added by young match 'calls', :controller => 'bids', :action => 'index' diff --git a/lib/redmine.rb b/lib/redmine.rb index 84f24e876..132d5fd58 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -223,8 +223,9 @@ end Redmine::MenuManager.map :top_enterprise_menu do |menu| menu.push :home, :home_path - menu.push :projects, { :controller => 'projects', :action => 'index', :project_type => 0 }, :caption => :label_project_plural menu.push :requirement, {:controller => 'bids', :action => 'index', :project_type => 0 } + menu.push :projects, { :controller => 'projects', :action => 'index', :project_type => 0 }, :caption => :label_project_plural + menu.push :developer, {:controller => 'users', :action => 'index', :project_type => 0 } menu.push :college_into, {:controller=>'projects', :action=>'course_enterprise', :project_type => 1 } # menu.push :investor, :home_path