From f3fe5d918e46b0876115e64ddb37f56aedf1c48f Mon Sep 17 00:00:00 2001 From: zhanghaitao <562681745@qq.com> Date: Thu, 7 Aug 2014 15:54:05 +0800 Subject: [PATCH 01/14] =?UTF-8?q?#832=20=E7=8A=B6=E6=80=81=E8=81=94?= =?UTF-8?q?=E5=8A=A8=E9=97=AE=E9=A2=98=E7=9A=84=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/_attributes.html.erb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb index e44578243..b17283f3b 100644 --- a/app/views/issues/_attributes.html.erb +++ b/app/views/issues/_attributes.html.erb @@ -50,15 +50,18 @@ var _v= obj; if(_v==100) { - //alert(3); + //var select=$("select[id='issue_status_id']"); + $("select[id='issue_status_id']").find("option[value='3']").attr("selected","selected"); } else if(_v==0) { - //alert(1); + //alert(1); + $("select[id='issue_status_id']").find("option[value='1']").attr("selected","selected"); } else if(_v!=100&&_v!=0) { // alert(2); + $("select[id='issue_status_id']").find("option[value='2']").attr("selected","selected"); } } From 387d4820590cb4a97e93cfdaaed302663baa0b7f Mon Sep 17 00:00:00 2001 From: linhk <304431313@.com> Date: Thu, 7 Aug 2014 15:58:00 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=97=A0=E5=9C=B0=E5=8C=BA=E3=80=81=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E5=8F=AF=E6=B3=A8=E5=86=8C=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/account_controller.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index c05d1172c..c1b38fa39 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -140,6 +140,15 @@ class AccountController < ApplicationController @user.password, @user.password_confirmation = user_params[:password], user_params[:password_confirmation] end + if(@cache_identityy == "") + flash.now[:error]= l(:label_identity)+l(:'activerecord.errors.messages.empty') + return + end + if(@cache_city == "") + flash.now[:error]= l(:label_location)+l(:'activerecord.errors.messages.empty') + return + end + case Setting.self_registration when '1' register_by_email_activation(@user) From af683f917dd11b87fe5ba5c43d2d78bf40ca150a Mon Sep 17 00:00:00 2001 From: linhk <304431313@.com> Date: Thu, 7 Aug 2014 16:09:50 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E5=90=8D=E9=9D=9E=E6=B3=95=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=88=90=E5=8A=9F=E6=96=B0=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/repository.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index 57a818270..c2736dd30 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -42,7 +42,7 @@ class Repository < ActiveRecord::Base validates_uniqueness_of :identifier, :scope => :project_id, :allow_blank => true validates_exclusion_of :identifier, :in => %w(show entry raw changes annotate diff show stats graph) # donwcase letters, digits, dashes, underscores but not digits only - validates_format_of :identifier, :with => /^[a-zA-Z0-9_\-]+$/, :allow_blank => true + validates_format_of :identifier, :with => /^[a-z0-9_\-]+$/, :allow_blank => true # Checks if the SCM is enabled when creating a repository validate :repo_create_validation, :on => :create From d087c5231462359ddc12828f83a060db6a627e5f Mon Sep 17 00:00:00 2001 From: chenmin <19763783@qq.com> Date: Thu, 7 Aug 2014 16:20:46 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index deb590d1f..d7d579dd1 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -1,4 +1,4 @@ -<% if @events_by_day.size >0 %> +<% if @events_by_day != nil && @events_by_day.size >0 %>

From d9a9867f964fb48546e52bfd6168fa42cc788b51 Mon Sep 17 00:00:00 2001 From: zhanghaitao <562681745@qq.com> Date: Thu, 7 Aug 2014 16:41:31 +0800 Subject: [PATCH 05/14] =?UTF-8?q?#815=20=E4=B8=AD=E8=8B=B1=E6=96=87?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/zh.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/locales/zh.yml b/config/locales/zh.yml index ab754feaf..572862174 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -315,7 +315,7 @@ zh: field_auth_source: 认证模式 field_hide_mail: 隐藏我的邮件地址 field_comments: 注释 - field_url: URL + field_url: 路径 field_start_page: 起始页 field_subproject: 子项目 field_hours: 小时 @@ -979,7 +979,7 @@ zh: label_change_properties: 修改属性 label_general: 一般 label_more: 更多>> - label_scm: SCM + label_scm: 管理系统 label_plugins: 插件 label_ldap_authentication: LDAP 认证 label_downloads_abbr: D/L @@ -1552,6 +1552,7 @@ zh: label_have_respond: 进行了反馈 label_welcome: 欢迎 label_join: 加入Trustie！ + label_repository_path: 库路径 label_board_description: 七嘴八舌，汇聚众人智慧，为您排忧解难！ label_create_course_description: 课程小社区，创建新课程，让我们共同分享多到想不到的公共资源！ label_welcome_page_to: 参与了 %{project_count} 个项目！ From cb4869fd20efda4ada60d33f0e91f6bd7ba0b789 Mon Sep 17 00:00:00 2001 From: linhk <304431313@.com> Date: Thu, 7 Aug 2014 17:16:00 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E5=90=8D=E9=95=BF255=E4=B8=AA?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E6=97=B6=E5=BC=82=E5=B8=B8=20=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E7=89=88=E6=9C=AC=E5=BA=93=E5=90=8D=E9=95=BF=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/repository.rb | 4 ++-- app/views/projects/settings/_repositories.html.erb | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index c2736dd30..260069f94 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -21,8 +21,8 @@ class Repository < ActiveRecord::Base include Redmine::Ciphering include Redmine::SafeAttributes - # Maximum length for repository identifiers - IDENTIFIER_MAX_LENGTH = 255 + # Maximum length for repository ideflashntifiers + IDENTIFIER_MAX_LENGTH = 254 belongs_to :project has_many :changesets, :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC" diff --git a/app/views/projects/settings/_repositories.html.erb b/app/views/projects/settings/_repositories.html.erb index 4ad14bf84..f4b505065 100644 --- a/app/views/projects/settings/_repositories.html.erb +++ b/app/views/projects/settings/_repositories.html.erb @@ -1,7 +1,7 @@ <% project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT %> <% ip = RepositoriesHelper::REPO_IP_ADDRESS %> <% if @project.repositories.any? %> - +
@@ -14,16 +14,16 @@ <% @project.repositories.sort.each do |repository| %> - - + <%if repository.scm_name=="Git"%> - + <%else %> - + <% end %>
<%= l(:field_identifier) %>
+ <%= link_to repository.identifier, {:controller => 'repositories', :action => 'show',:id => @project, :repository_id => repository.identifier_param} if repository.identifier.present? %> <%= checked_image repository.is_default? %><%=h repository.scm_name %><%=h repository.scm_name %>http://<%= repository.login.to_s %>_<%= repository.identifier.to_s%>@<%= ip %><%=h repository.url.slice(project_path_cut, repository.url.length) %>http://<%= repository.login.to_s %>_<%= repository.identifier.to_s%>@<%= ip %><%=h repository.url.slice(project_path_cut, repository.url.length) %><%=h repository.url %><%=h repository.url %> From eac85b338fb891f6b103bd4e660ba4bae9cc8e83 Mon Sep 17 00:00:00 2001 From: zhanghaitao <562681745@qq.com> Date: Thu, 7 Aug 2014 17:56:29 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E6=A0=87=E7=A4=BA=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/_form.html.erb | 4 ++-- app/views/repositories/_form.html.erb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb index 7c84bf84b..512c2df82 100644 --- a/app/views/projects/_form.html.erb +++ b/app/views/projects/_form.html.erb @@ -9,8 +9,8 @@ <%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %>

-

<%= f.text_field :identifier, :required => true, :size => 60, :style => "width:488px;", :disabled => @project.identifier_frozen?, :maxlength => Project::IDENTIFIER_MAX_LENGTH, - value:"#{User.current.id.to_s + '_' +format_time(Time.now).to_s}" %> +

<%= f.text_field :identifier, :required => true, :size => 60, :style => "width:488px;", :disabled => @project.identifier_frozen?, :maxlength => Project::IDENTIFIER_MAX_LENGTH, + value:"#{User.current.id.to_s + '_' +Time.now.to_s.gsub(' ','_').gsub(':','').gsub('+','')}" %> <% unless @project.identifier_frozen? %> <%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info).html_safe %> <% end %>

diff --git a/app/views/repositories/_form.html.erb b/app/views/repositories/_form.html.erb index b9a3a6c83..1fabf47c8 100644 --- a/app/views/repositories/_form.html.erb +++ b/app/views/repositories/_form.html.erb @@ -12,7 +12,7 @@

<%= f.check_box :is_default, :label => :field_repository_is_default %>

<%= f.text_field :identifier, :required => true, :disabled => @repository.identifier_frozen?, - value:"#{User.current.id.to_s + '_' +format_time(Time.now).to_s}"%> + value:"#{User.current.id.to_s + '_' +Time.now.to_s.gsub(' ','_').gsub(':','').gsub('+','')}"%> <% unless @repository.identifier_frozen? %> <%= l(:text_length_between, :min => 1, :max => Repository::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_repository_identifier_info).html_safe %> <% end %>

From 70a1839e74d1b39c26113226eb4587f0bcbee4e7 Mon Sep 17 00:00:00 2001 From: linhk <304431313@.com> Date: Fri, 8 Aug 2014 09:30:48 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E8=8B=B1=E6=96=87=E7=95=8C=E9=9D=A2-?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95=EF=BC=88?= =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AF=BE=E7=A8=8B=E3=80=81=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E3=80=81=E7=BC=96=E8=BE=91=E8=B5=84=E6=96=99=EF=BC=89=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_base_header.html.erb | 14 +++++++------- config/locales/en.yml | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index fafc49c0a..3a7a6a8ee 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -27,7 +27,7 @@ #@nav_dispaly_user_label = 1 end %> -
+
@@ -44,8 +44,8 @@ <% if User.current.user_extensions && [UserExtensions::TEACHER, UserExtensions::STUDENT].include?(User.current.user_extensions.identity) -%> <% hasCourse=true%> -
  • <%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id, host: Setting.course_domain} %> -
      +
    • <%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id, host: Setting.course_domain} %> +
        <% User.current.courses.each do |course| %> <% if !course_endTime_timeout?(course) %>
      • <%= link_to course.name.truncate(10, omission: '...'), {:controller => 'courses',:action => 'show',id:course.id, host: Setting.course_domain} %>
        • @@ -56,7 +56,7 @@ <% end -%> <% end %> -
      • <%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.project_domain} %> +
      • <%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.project_domain} %> <% if hasCourse %>
          @@ -68,7 +68,7 @@ <% end %>
        • -
      • <%=link_to l(:label_user_edit), {:controller => 'my', :action=> 'account', host: Setting.user_domain}%> +
      • <%=link_to l(:label_user_edit), {:controller => 'my', :action=> 'account', host: Setting.user_domain}%>
      • @@ -76,9 +76,9 @@ <%=link_to l(:label_my_message)+'('+User.current.count_new_jour.to_s+')', { :controller => 'users', :action => 'user_newfeedback', id: User.current.id, host: Setting.user_domain }, {:class => 'my-message'} if User.current.logged?%>
    -
    • +
    <% end -%> - <%#= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%> + <%#= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%> <%= render_dynamic_nav if User.current.logged? || !Setting.login_required? -%> <%# 自建导航条在base页面中以 (@nav_dispaly......) 开头变量设定， 全局搜索即可发现 %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 33e1eda9b..1d7b01d4f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1158,6 +1158,7 @@ en: #huang label_file_new: Download label_user_edit: "Edit information" + label_my_course: "My Course" label_user_info: "User information" #huang 添加 label_user_watcher: "Following" # huang添加的 # modified by bai label_user_fans: "Followed by" # modified by bai From b5e8b1280680d50661df52db7cf98fc842728746 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 8 Aug 2014 11:32:15 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=E6=8C=89=E9=92=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E7=A1=AE=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/my/password.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/my/password.html.erb b/app/views/my/password.html.erb index 5e2b1989c..2808a8742 100644 --- a/app/views/my/password.html.erb +++ b/app/views/my/password.html.erb @@ -13,7 +13,7 @@

    <%= password_field_tag 'new_password_confirmation', nil, :size => 25 %>

    -<%= submit_tag l(:button_apply) %> +<%= submit_tag l(:label_button_ok) %> <% end %> From 683cd9f9189f5651f7d723986010cd2984502039 Mon Sep 17 00:00:00 2001 From: z9hang Date: Fri, 8 Aug 2014 13:47:02 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 1 + app/helpers/user_score_helper.rb | 70 ++++++++++++++++++---------- app/views/users/_user_score.html.erb | 3 +- 3 files changed, 49 insertions(+), 25 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index cba7784bc..eaa96e82a 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -56,6 +56,7 @@ class UsersController < ApplicationController include WordsHelper include GitlabHelper include UserScoreHelper + helper :user_score # added by liuping 关注 diff --git a/app/helpers/user_score_helper.rb b/app/helpers/user_score_helper.rb index 8c00a6b23..dc43de32a 100644 --- a/app/helpers/user_score_helper.rb +++ b/app/helpers/user_score_helper.rb @@ -372,8 +372,8 @@ module UserScoreHelper result.post_issue = 0 result.total_score = 0 result.score_type =type - unless project_id.nil? - result.project_id = project_id + unless project.nil? + result.project_id = project.id end else result = option_number.first @@ -416,12 +416,26 @@ module UserScoreHelper def memo_num(user,project=nil) if project.nil? Message.includes(:author).joins(:board).where("#{Message.table_name}.parent_id IS NULL and #{Message.table_name}.author_id = '#{user.id}' and #{Board.table_name}.project_id != -1").all.count #+ Memo.includes(:author).where("parent_id IS NULL and author_id = '#{user.id}'").all.count + + #user.messages.where("parent_id IS NULL").count else Message.includes(:author).joins(:board).where("#{Message.table_name}.parent_id IS NULL and #{Message.table_name}.author_id = '#{user.id}' and #{Board.table_name}.project_id = #{project.id}").all.count end end + def memo_score(user,project=nil) + if project.nil? + User.find_by_sql("SELECT `users`.id,(SELECT COUNT(*) * 2 FROM `messages` JOIN `boards` ON boards.project_id != -1 AND messages.board_id = boards.id +WHERE messages.parent_id IS NULL AND messages.author_id = `users`.id) AS m_count +FROM `users` where id = #{user.id}") + else + User.find_by_sql("SELECT `users`.id,(SELECT COUNT(*) * 2 FROM `messages` JOIN `boards` ON boards.project_id = '#{project.id}' AND messages.board_id = boards.id +WHERE messages.parent_id IS NULL AND messages.author_id = `users`.id) AS m_count +FROM `users` where id = #{user.id}") + end + end + #更新对缺陷留言数 def update_messges_for_issue(user,type,project=nil) option_number = get_option_number(user,type) @@ -437,6 +451,14 @@ module UserScoreHelper end end + def messges_for_issue_score(user,project=nil) + if project.nil? + User.find_by_sql("SELECT users.id,(SELECT COUNT(*) FROM journals WHERE journals.user_id = users.id AND journals.notes IS NOT NULL AND journals.notes != '') AS m_score FROM users where id = #{user.id}") + else + User.find_by_sql("SELECT users.id,(SELECT COUNT(*) FROM journals join issues on #{Journal.table_name}.journalized_type = 'Issue' and #{Journal.table_name}.journalized_id = #{Issue.table_name}.id WHERE journals.user_id = users.id AND journals.notes IS NOT NULL AND journals.notes != ''and #{Issue.table_name}.project_id = '#{project.id}') AS m_score FROM users where id = #{user.id}") + end + end + #更新更改缺陷状态状态次数 def update_issues_status(user,type,project=nil) option_number = get_option_number(user,type) @@ -508,8 +530,8 @@ module UserScoreHelper def tread_num(user,project=nil) if project.nil? - result0 = PraiseTread.where("praise_tread_object_type = 'Issue' || praise_tread_object_type = 'Message' and praise_or_tread = 0 and user_id = '#{user.id}'").all.count - pts = PraiseTread.where("praise_tread_object_type = 'Issue' || praise_tread_object_type = 'Message' and praise_or_tread = 0").all + result0 = PraiseTread.where("praise_tread_object_type IN ( 'Issue','Message') and praise_or_tread = 0 and user_id = '#{user.id}'").all.count + pts = PraiseTread.where("praise_tread_object_type IN ( 'Issue','Message') and praise_or_tread = 0").all result = [] result1 = [] result2 = [] @@ -521,18 +543,18 @@ module UserScoreHelper target_user = obj.author level = UserLevels.get_level(pt.user)#pt.user.get_level project = pt.project - if level == 1 && target_user.id = user.id + if level == 1 && target_user.id == user.id result << pt - elsif level == 2 && target_user.id = user.id + elsif level == 2 && target_user.id == user.id result1 << pt - elsif level == 3 && target_user.id = user.id + elsif level == 3 && target_user.id == user.id result2 << pt end end - [:tread=>result0,:tead_by_one => result.count,:tread_by_two => result1.count,:tread_by_three =>result2.count] + {:tread=>result0,:tead_by_one => result.count,:tread_by_two => result1.count,:tread_by_three =>result2.count} else - result0 = PraiseTread.where("praise_tread_object_type = 'Issue' || praise_tread_object_type = 'Message' and praise_or_tread = 0 and user_id = '#{user.id}'").all.count - pts = PraiseTread.where("praise_tread_object_type = 'Issue' || praise_tread_object_type = 'Message' and praise_or_tread = 0").all + result0 = PraiseTread.where("praise_tread_object_type IN ( 'Issue','Message') and praise_or_tread = 0 and user_id = '#{user.id}'").all.count + pts = PraiseTread.where("praise_tread_object_type IN ( 'Issue','Message') and praise_or_tread = 0").all result = [] result1 = [] result2 = [] @@ -547,15 +569,15 @@ module UserScoreHelper target_user = obj.author level = UserLevels.get_level(pt.user)#pt.user.get_level project = pt.project - if level == 1 && target_user.id = user.id + if level == 1 && target_user.id == user.id result << pt - elsif level == 2 && target_user.id = user.id + elsif level == 2 && target_user.id == user.id result1 << pt - elsif level == 3 && target_user.id = user.id + elsif level == 3 && target_user.id == user.id result2 << pt end end - [:tread=>result0,:tead_by_one => result.count,:tread_by_two => result1.count,:tread_by_three =>result2.count] + {:tread=>result0,:tead_by_one => result.count,:tread_by_two => result1.count,:tread_by_three =>result2.count} end end @@ -572,7 +594,7 @@ module UserScoreHelper def praise_num(user,project=nil) if !project.nil? - pts = PraiseTread.where("praise_tread_object_type = 'Issue' || praise_tread_object_type = 'Message' and praise_or_tread = 1").all + pts = PraiseTread.where("praise_tread_object_type IN ( 'Issue','Message') and praise_or_tread = 1").all result = [] result1 = [] result2 = [] @@ -587,17 +609,17 @@ module UserScoreHelper target_user = obj.author level = UserLevels.get_level(pt.user)#pt.user.get_level project = pt.project - if level == 1 && target_user.id = user.id + if level == 1 && target_user.id == user.id result << pt - elsif level == 2 && target_user.id = user.id + elsif level == 2 && target_user.id == user.id result1 << pt - elsif level == 3 && target_user.id = user.id + elsif level == 3 && target_user.id == user.id result2 << pt end end - [:praise_by_one => result.count,:praise_by_two => result1.count,:praise_by_three => result2.count] + {:praise_by_one => result.count,:praise_by_two => result1.count,:praise_by_three => result2.count} else - pts = PraiseTread.where("praise_tread_object_type = 'Issue' || praise_tread_object_type = 'Message' and praise_or_tread = 1").all + pts = PraiseTread.where("praise_tread_object_type IN ( 'Issue','Message') and praise_or_tread = 1").all result = [] result1 = [] result2 = [] @@ -612,15 +634,15 @@ module UserScoreHelper target_user = obj.author level = UserLevels.get_level(pt.user)#pt.user.get_level project = pt.project - if level == 1 && target_user.id = user.id + if level == 1 && target_user.id == user.id result << pt - elsif level == 2 && target_user.id = user.id + elsif level == 2 && target_user.id == user.id result1 << pt - elsif level == 3 && target_user.id = user.id + elsif level == 3 && target_user.id == user.id result2 << pt end end - [:praise_by_one => result.count,:praise_by_two => result1.count,:praise_by_three => result2.count] + {:praise_by_one => result.count,:praise_by_two => result1.count,:praise_by_three => result2.count} end end diff --git a/app/views/users/_user_score.html.erb b/app/views/users/_user_score.html.erb index 53f05a2dd..338d72ada 100644 --- a/app/views/users/_user_score.html.erb +++ b/app/views/users/_user_score.html.erb @@ -1,5 +1,6 @@ <%= l(:label_user_grade)%>: -<%= link_to(format("%.2f" , user.user_score_attr.total_score).to_i, {:controller => 'users', + +<%= link_to(format("%.2f" ,user_scores(user,1).total_score ).to_i, {:controller => 'users', :action => 'show_new_score', :remote => true, :id => user.id From f8c6b661198cef6604ed016d834a519223f697e0 Mon Sep 17 00:00:00 2001 From: z9hang Date: Fri, 8 Aug 2014 15:09:32 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E5=A4=84=E5=AF=BC=E8=88=AA=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/my_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb index a87df4fef..d55afbb31 100644 --- a/app/controllers/my_controller.rb +++ b/app/controllers/my_controller.rb @@ -16,6 +16,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class MyController < ApplicationController + layout "users_base" before_filter :require_login helper :issues From dd64f13e497002bdd4a7032640cb5b5c75e546a6 Mon Sep 17 00:00:00 2001 From: chenmin <19763783@qq.com> Date: Fri, 8 Aug 2014 15:37:26 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=A9=BA=E8=A1=8Cbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/course.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index 9d5037107..d48f11774 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -101,7 +101,7 @@

    <% end %> - <% find_all_new_hot_course(9, @school_id).map do |course| %> + <% find_all_new_hot_course(10, @school_id).map do |course| %>
  • /,"") %>>
    <%= image_tag(get_course_avatar(course), :class => "avatar-4") %> @@ -132,7 +132,7 @@
    <% else %> - <% if school_course.count < 9 %> + <% if school_course.count < 10 %> <%= link_to "更多>>", {:controller => 'courses', :action => 'index', :school_id => nil} %> @@ -181,7 +181,7 @@
    • <%end%> <% end; reset_cycle %> - <% if school_course.count < 9 %> + <% if school_course.count < 10 %>

  • @@ -189,7 +189,7 @@ 该学校开设课程较少，您可以查看其他学校课程

    • - <% find_all_new_hot_course(9 - school_course.count, @school_id).map do |course| %> + <% find_all_new_hot_course(10 - school_course.count, @school_id).map do |course| %>
  • /,"") %>>
    <%= image_tag(get_course_avatar(course), :class => "avatar-4") %> From 6037421c7ded5579ab56fc00ca6063c1c62ad050 Mon Sep 17 00:00:00 2001 From: chenmin <19763783@qq.com> Date: Fri, 8 Aug 2014 15:45:06 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=9A=84=E5=AD=A6=E6=A0=A1=E6=98=BE=E7=A4=BA?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/course.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index d48f11774..7cab331b6 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -101,7 +101,7 @@

    <% end %> - <% find_all_new_hot_course(10, @school_id).map do |course| %> + <% find_all_new_hot_course(9, @school_id).map do |course| %>
  • /,"") %>>
    <%= image_tag(get_course_avatar(course), :class => "avatar-4") %> From 0028c1142640b49ba78f0a339b79fede7d8016be Mon Sep 17 00:00:00 2001 From: linhk <304431313@.com> Date: Fri, 8 Aug 2014 16:43:34 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E9=80=80=E5=87=BA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/account_controller.rb | 4 ++-- app/controllers/projects_controller.rb | 13 ++++++++++++ app/helpers/watchers_helper.rb | 5 ++++- app/views/layouts/_join_exit_project.html.erb | 20 +++++++++++++++++++ app/views/layouts/base_projects.html.erb | 15 ++------------ app/views/projects/exit_project.js.erb | 1 + config/locales/en.yml | 1 + config/locales/zh.yml | 1 + config/routes.rb | 1 + 9 files changed, 45 insertions(+), 16 deletions(-) create mode 100644 app/views/layouts/_join_exit_project.html.erb create mode 100644 app/views/projects/exit_project.js.erb diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index c1b38fa39..4174f427e 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -119,8 +119,8 @@ class AccountController < ApplicationController @user = User.new @user.safe_attributes = user_params if params[:identity] == "2" # 2 企业 - #@user.firstname = params[:enterprise_name] - #@user.lastname = l(:field_enterprise) + @user.firstname = params[:enterprise_name] + @user.lastname = l(:field_enterprise) end @user.admin = false @user.register diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 3f6827159..1bc75d9d1 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -892,6 +892,18 @@ class ProjectsController < ApplicationController end end + def exit_project + @project = Project.find params[:id] + if User.current.login? + members = Member.where(:user_id => User.current.id, :project_id=>params[:id]).first + if members != nil + members.destroy + end + respond_to do |format| + format.js + end + end + end private def memberAccess @@ -1038,4 +1050,5 @@ class ProjectsController < ApplicationController end #gcmend + end diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index ea72e8184..be5609d7c 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -246,4 +246,7 @@ module WatchersHelper link_to text, url, :remote => true, :method => method ,:class=>css end - end + def exit_project_link(project) + link_to("退出项目",exit_cur_project_path(project.id),:remote => true ) + end + end diff --git a/app/views/layouts/_join_exit_project.html.erb b/app/views/layouts/_join_exit_project.html.erb new file mode 100644 index 000000000..c43ad55a2 --- /dev/null +++ b/app/views/layouts/_join_exit_project.html.erb @@ -0,0 +1,20 @@ +
    + + <% if ( !(User.current.member_of? @project) && User.current.login?) %> + <%= watcher_link(@project, User.current) %> + <% end %> +
    + +
    + <% if ( !(User.current.member_of? @project) && User.current.login?) %> + + <%= applied_link(@project, User.current) %> + <% end %> +
    + + +
    + <% if ((User.current.member_of? @project) && User.current.login?) %> + <%= exit_project_link(@project) %> + <% end %> +
    \ No newline at end of file diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 004aabc51..eea7a0f61 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -74,20 +74,9 @@ <% end %>
    -
    - - <% if ( !(User.current.member_of? @project) && User.current.login?) %> - <%= watcher_link(@project, User.current) %> - <% end %> -
    - -
    - <% if ( !(User.current.member_of? @project) && User.current.login?) %> - - <%= applied_link(@project, User.current) %> - <% end %> +
    + <%= render 'layouts/join_exit_project' %>
    -
    • diff --git a/app/views/projects/exit_project.js.erb b/app/views/projects/exit_project.js.erb new file mode 100644 index 000000000..709f878be --- /dev/null +++ b/app/views/projects/exit_project.js.erb @@ -0,0 +1 @@ +$('#join_exit_project_div').html("<%= escape_javascript(render(:partial => 'layouts/join_exit_project')) %>"); diff --git a/config/locales/en.yml b/config/locales/en.yml index 1d7b01d4f..367624f89 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1197,6 +1197,7 @@ en: label_tags_issue_description: issue description label_tags_all_objects: all objects label_apply_project: Apply Project + label_exit_project: Exit Project label_apply_project_waiting: "Application has been submitted, please wait for administrator review." label_unapply_project: Unsubscribe diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 572862174..cdd0ee9b7 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1409,6 +1409,7 @@ zh: label_tags_issue_description: 问题描述 label_tags_all_objects: 所有 label_apply_project: 申请加入 + label_exit_project: 退出项目 label_apply_project_waiting: 已处理申请，请等待管理员审核 label_unapply_project: 取消申请 diff --git a/config/routes.rb b/config/routes.rb index 1e75ac23a..9d9b9d13b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -510,6 +510,7 @@ RedmineApp::Application.routes.draw do get 'projects/:id/repository/:repository_id', :to => 'repositories#show', :path => nil get 'projects/:id/repository', :to => 'repositories#show', :path => nil + get 'projects/:id/exit', :to => 'projects#exit_project', :as => 'exit_cur_project' # additional routes for having the file name at the end of url get 'attachments/:id/:filename', :to => 'attachments#show', :id => /\d+/, :filename => /.*/, :as => 'named_attachment'