diff --git a/app/controllers/avatar_controller.rb b/app/controllers/avatar_controller.rb index fa7eb6052..b7dec5453 100644 --- a/app/controllers/avatar_controller.rb +++ b/app/controllers/avatar_controller.rb @@ -55,17 +55,20 @@ class AvatarController < ApplicationController # saved = @avatar.save begin f = Magick::ImageList.new(diskfile) - width = 300.0 - proportion = (width/f[0].columns) - height = (f[0].rows*proportion) - f.resize_to_fill!(width,height) - # f.scale!(width,height) - f.write(diskfile) + # gif格式不再做大小处理 + if f.format != 'GIF' + width = 300.0 + proportion = (width/f[0].columns) + height = (f[0].rows*proportion) + f.resize_to_fill!(width,height) + f.write(diskfile) + end + rescue Exception => e logger.error "[Error] avatar : avatar_controller#upload ===> #{e}" end - + respond_to do |format| format.js format.api { diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index c42944947..aa5e2c2a6 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -502,45 +502,7 @@ class CoursesController < ApplicationController end - def get_course_activity courses, activities - @course_ids=activities.keys() - days = Setting.activity_days_default.to_i - date_to ||= Date.today + 1 - date_from = date_to - days-1.years - - #file_count - Attachment.where(container_id: @course_ids, container_type: Course).where("created_on>?", date_from).each do |attachment| - activities[attachment.container_id]+=1 - end - - #message_count - Board.where(course_id: @course_ids).each do |board| -# activities[board.course_id]+=1 - activities[board.course_id]+=board.messages.where("updated_on>?", date_from).count - end - - #news - News.where(course_id: @course_ids).where("created_on>?",date_from).each do |news| - activities[news.course_id]+=1 - end - - #feedbackc_count - JournalsForMessage.where(jour_id: @course_ids, jour_type: Course).each do |jourformess| - activities[jourformess.jour_id]+=1 - end - - #activities!=0 - i=0; - courses.each do |course| - id=course.id - if activities[id]==0 - activities[id]=1 - end - end - - return activities - end def toggleCourse @course_prefs = Course.find_by_extra(@course.extra) @@ -643,6 +605,15 @@ class CoursesController < ApplicationController events = @activity.events(@date_from, @date_to, :is_public => 1) end + # 无新动态时，显示老动态 + if events.count == 0 + if User.current.member_of_course?(@course)|| User.current.admin? + events = @activity.events + else + events = @activity.events(:is_public => 1) + end + end + @offset, @limit = api_offset_and_limit({:limit => 10}) @events_count = events.count @events_pages = Paginator.new @events_count, @limit, params['page'] diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index 3d541fd61..031f78277 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -57,36 +57,45 @@ class FilesController < ApplicationController elsif params[:course_id] @isproject = false + sort = "" if params[:sort] - if params[:sort].include?":" - @orderBy = params[:sort].split(":")[0] - @orderType = params[:sort].split(":")[1].split(",")[0] - else - @orderBy = params[:sort].split(",")[0] - @orderType = "asc" + params[:sort].split(",").each do |sort_type| + order_by = sort_type.split(":") + + case order_by[0] + when "filename" + attribute = "filename" + when "size" + attribute = "filesize" + when "attach_type" + attribute = "attachtype" + when "content_type" + attribute = "created_on" + when "field_file_dense" + attribute = "is_public" + when "downloads" + attribute = "downloads" + when "created_on" + attribute = "created_on" + end + + if order_by.count == 1 + sort += "#{Attachment.table_name}.#{attribute} desc " + elsif order_by.count == 2 + sort += "#{Attachment.table_name}.#{attribute} #{order_by[1]} " + end + if sort_type != params[:sort].split(",").last + sort += "," + end end end - - if @orderBy=="size" - @orderBy="filesize" - elsif @orderBy=="field_file_dense" - @orderBy="is_public" - elsif @orderBy=="attach_type" - @orderBy="attachtype" - elsif @orderBy=="content_type" - @orderBy="attachtype" - end - - if @orderBy - @containers = [ Course.includes(:attachments).reorder("#{Attachment.table_name}.#{@orderBy} #{@orderType}").find(@course.id)] - else - @containers = [ Course.includes(:attachments).reorder("#{Attachment.table_name}.created_on desc").find(@course.id)] - end + @containers = [ Course.includes(:attachments).reorder(sort).find(@course.id)] show_attachments @containers render :layout => 'base_courses' end + end def new @@ -226,6 +235,7 @@ class FilesController < ApplicationController elsif @course @containers = [ Course.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@course.id)] end + show_attachments @containers @attachtype = params[:type].to_i @contenttype = params[:contentType].to_s diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index ee42c2c6a..c0561bd1c 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -42,7 +42,7 @@ class ProjectsController < ApplicationController before_filter :authorize_global, :only => [:new, :create,:view_homework_attaches] before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy, :calendar] before_filter :file, :statistics, :watcherlist - before_filter :find_project_repository, :only => [:show] + #before_filter :find_project_repository, :only => [:show] # 除非项目内人员，不可查看成员, TODO: 完了写报表里去 before_filter :memberAccess, only: :member @@ -106,7 +106,7 @@ class ProjectsController < ApplicationController def index #调用存储过程更新提交次数 - ActiveRecord::Base.connection.execute("CALL sp_project_status_cursor();") + #ActiveRecord::Base.connection.execute("CALL sp_project_status_cursor();") #Modified by nie @project_type = params[:project_type].to_i per_page_option = 10 @@ -594,6 +594,7 @@ class ProjectsController < ApplicationController "show_news" => true, "show_bids" => true, "show_contests" => true, + "show_wiki_edits"=>true, "show_journals_for_messages" => true } @date_to ||= Date.today + 1 diff --git a/app/controllers/trackers_controller.rb b/app/controllers/trackers_controller.rb index de686493b..a317f82de 100644 --- a/app/controllers/trackers_controller.rb +++ b/app/controllers/trackers_controller.rb @@ -21,7 +21,7 @@ class TrackersController < ApplicationController before_filter :require_admin, :except => :index before_filter :require_admin_or_api_request, :only => :index accept_api_auth :index - + include CoursesHelper def index respond_to do |format| format.html { @@ -37,8 +37,13 @@ class TrackersController < ApplicationController def new @tracker ||= Tracker.new(params[:tracker]) @trackers = Tracker.sorted.all - @projects = Project.all + @projects = Project.where("project_type = #{Project::ProjectType_project}").all @courses = Course.all + @course_activity_count=Hash.new + @courses.each do |course| + @course_activity_count[course.id]=0 + end + @course_activity_count=get_course_activity @courses,@course_activity_count end def create @@ -58,7 +63,8 @@ class TrackersController < ApplicationController def edit @tracker ||= Tracker.find(params[:id]) - @projects = Project.all + @projects = Project.where("project_type = #{Project::ProjectType_project}").all + @courses = Course.all end def update diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 98b24bc12..d15036fa0 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -46,6 +46,7 @@ class UsersController < ApplicationController #william before_filter :require_login, :only => [:tag_save,:tag_saveEx] + #before_filter :refresh_changests, :only =>[:user_activities,:user_courses,:user_projects,:user_newfeedback] helper :sort @@ -68,6 +69,17 @@ class UsersController < ApplicationController # fq helper :words + + def refresh_changests + if !(@user.nil?) && !(@user.memberships.nil?) + @user.memberships.each do |member| + unless member.project.nil? + member.project.repository.fetch_changesets if Setting.autofetch_changesets? + end + end + end + end + #added by young def user_projects diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 4e7cf0ce9..0d9206738 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -151,7 +151,7 @@ class WelcomeController < ApplicationController def entry_select #@first_page = FirstPage.where("page_type = 'project'").first url = request.original_url.gsub('/','') - if url.include?(Setting.host_course) + if url.include?(Setting.host_course.gsub('/','')) if @first_page.show_course == 1 course render :course @@ -160,7 +160,7 @@ class WelcomeController < ApplicationController end return 0 - elsif url.include?(Setting.host_contest) + elsif url.include?(Setting.host_contest.gsub('/','')) if @first_page.show_contest == 1 contest render :contest @@ -169,7 +169,7 @@ class WelcomeController < ApplicationController end return 0 - elsif url.include?(Setting.host_user) + elsif url.include?(Setting.host_user.gsub('/','')) redirect_to(:controller => "users", :action => "index") end diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb index 2d03b2112..f2502e03e 100644 --- a/app/controllers/words_controller.rb +++ b/app/controllers/words_controller.rb @@ -90,7 +90,6 @@ class WordsController < ApplicationController end def destroyJournal - @journalP=JournalsForMessage.find(params[:object_id]) @journalP.destroy diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index d075f67ae..a005b299b 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -480,4 +480,45 @@ module CoursesHelper type end + #获取课程动态 + def get_course_activity courses, activities + @course_ids=activities.keys() + + days = Setting.activity_days_default.to_i + date_to ||= Date.today + 1 + date_from = date_to - days-1.years + + #file_count + Attachment.where(container_id: @course_ids, container_type: Course).where("created_on>?", date_from).each do |attachment| + activities[attachment.container_id]+=1 + end + + #message_count + Board.where(course_id: @course_ids).each do |board| +# activities[board.course_id]+=1 + activities[board.course_id]+=board.messages.where("updated_on>?", date_from).count + end + + #news + News.where(course_id: @course_ids).where("created_on>?",date_from).each do |news| + activities[news.course_id]+=1 + end + + #feedbackc_count + JournalsForMessage.where(jour_id: @course_ids, jour_type: Course).each do |jourformess| + activities[jourformess.jour_id]+=1 + end + + #activities!=0 + i=0; + courses.each do |course| + id=course.id + if activities[id]==0 + activities[id]=1 + end + end + + return activities + end + end diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 315a86340..637c92db3 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -326,7 +326,7 @@ module IssuesHelper if detail.property == 'attr' && detail.prop_key == 'description' s = l(:text_journal_changed_no_detail, :label => label) unless no_html - diff_link = link_to 'diff', + diff_link = link_to l(:label_diff), {:controller => 'journals', :action => 'diff', :id => detail.journal_id, :detail_id => detail.id, :only_path => options[:only_path]}, :title => l(:label_view_diff) diff --git a/app/helpers/project_score_helper.rb b/app/helpers/project_score_helper.rb index bdb070cc2..104cd16cb 100644 --- a/app/helpers/project_score_helper.rb +++ b/app/helpers/project_score_helper.rb @@ -71,11 +71,24 @@ module ProjectScoreHelper pss = ProjectScore.where("project_id = '#{project.id}'") if pss.nil? || pss.count == 0 ps = ProjectScore.new + ps.issue_num = issue_num(project) + ps.board_message_num = board_message_num(project) + ps.changeset_num = changesets_num(project) + ps.documents_num = documents_num(project) + ps.issue_journal_num = issue_journal_num(project) + ps.news_num = news_num(project) + ps.score = result ps.project = project ps.save else ps = pss.first + ps.issue_num = issue_num(project) + ps.board_message_num = board_message_num(project) + ps.changeset_num = changesets_num(project) + ps.documents_num = documents_num(project) + ps.issue_journal_num = issue_journal_num(project) + ps.news_num = news_num(project) ps.score = result ps.save end @@ -95,4 +108,15 @@ module ProjectScoreHelper end end + def get_project_score project + pss = ProjectScore.where("project_id = '#{project.id}'") + ps = nil + if pss.nil? || pss.count == 0 + ps = nil + else + ps = pss.first + end + ps + end + end \ No newline at end of file diff --git a/app/models/changeset.rb b/app/models/changeset.rb index f2228e699..b9ce4acf5 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -63,7 +63,7 @@ class Changeset < ActiveRecord::Base includes(:repository => :project).where(Project.allowed_to_condition(args.shift || User.current, :view_changesets, *args)) } - after_create :scan_for_issues,:be_user_score # user_score + after_create :scan_for_issues,:refresh_changests#:be_user_score # user_score after_update :be_user_score after_destroy :down_user_score before_create :before_create_cs @@ -305,10 +305,13 @@ class Changeset < ActiveRecord::Base # update user score def be_user_score UserScore.project(:push_code, self.user,self, { changeset_id: self.id }) - #更新用户等级 - UserLevels.update_user_level(self.user) - update_changeset(self.user,1) - update_changeset(self.user,2,self.repository.project) + unless self.user.nil? + #更新用户等级 + UserLevels.update_user_level(self.user) + update_changeset(self.user,1) + update_changeset(self.user,2,self.repository.project) + end + end #积分刷新 @@ -318,4 +321,11 @@ class Changeset < ActiveRecord::Base update_changeset(self.user,2,self.repository.project) end + #刷新本次提交（补全相关信息如：user_id等） + def refresh_changests + unless self.repository.nil? + self.repository.fetch_changesets if Setting.autofetch_changesets? + end + end + end diff --git a/app/models/option_number.rb b/app/models/option_number.rb index 8ba32a575..0ddea1bff 100644 --- a/app/models/option_number.rb +++ b/app/models/option_number.rb @@ -1,4 +1,14 @@ class OptionNumber < ActiveRecord::Base attr_accessible :attachment, :changeset, :document, :follow, :issue_done_ratio, :issues_status, :memo, :messages_for_issues, :post_issue, :praise_by_one, :praise_by_three, :praise_by_two, :replay_for_memo, :replay_for_message, :score_type, :total_score, :tread, :tread_by_one, :tread_by_three, :tread_by_two, :user_id + def self.get_user_option_number user_id + result = nil + unless user_id.nil? + ons = OptionNumber.find_all_by_user_id(user_id); + unless (ons .nil? && ons.count > 0) + result = ons.first + end + end + result + end end diff --git a/app/models/repository.rb b/app/models/repository.rb index 260069f94..5680f05a7 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -39,7 +39,8 @@ class Repository < ActiveRecord::Base validates_length_of :password, :maximum => 255, :allow_nil => true validates_length_of :identifier, :maximum => IDENTIFIER_MAX_LENGTH, :allow_blank => true validates_presence_of :identifier#, :unless => Proc.new { |r| r.is_default? || r.set_as_default? } - validates_uniqueness_of :identifier, :scope => :project_id, :allow_blank => true + #validates_uniqueness_of :identifier, :scope => :project_id, :allow_blank => true + validates_uniqueness_of :identifier, :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-z0-9_\-]+$/, :allow_blank => true diff --git a/app/models/tracker.rb b/app/models/tracker.rb index d487de67e..6a0069975 100644 --- a/app/models/tracker.rb +++ b/app/models/tracker.rb @@ -32,6 +32,7 @@ class Tracker < ActiveRecord::Base end has_and_belongs_to_many :projects + has_and_belongs_to_many :courses has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => "#{table_name_prefix}custom_fields_trackers#{table_name_suffix}", :association_foreign_key => 'custom_field_id' acts_as_list diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb index ca33b7516..35e066d45 100644 --- a/app/views/boards/_course_show.html.erb +++ b/app/views/boards/_course_show.html.erb @@ -37,7 +37,7 @@
- 共有 <%=link_to @topics.count %> 个贴子 + 共有 <%=link_to @topic_count,:controller => 'boards',:action => 'index' %> 个贴子 <%= link_to l(:label_message_new), new_board_message_path(@board), diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb index ef1afd27e..8cd46c35b 100644 --- a/app/views/boards/_project_show.html.erb +++ b/app/views/boards/_project_show.html.erb @@ -43,7 +43,7 @@
- 共有 <%= link_to @topics.count %> 个贴子 + 共有 <%= link_to @topic_count,:controller => 'boards',:action => 'index' %> 个贴子 <% if @project.enabled_modules.where("name = 'boards'").count > 0 %> <%= link_to l(:label_message_new), diff --git a/app/views/courses/_homework_form.html.erb b/app/views/courses/_homework_form.html.erb index bfecb5304..f93d57f90 100644 --- a/app/views/courses/_homework_form.html.erb +++ b/app/views/courses/_homework_form.html.erb @@ -22,15 +22,22 @@ <%= error_messages_for 'bid' %>

<%= l(:label_homeworks_form_new_description) %>

-

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

+

+ <%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;", :maxlength => Bid::NAME_LENGTH_LIMIT, :onblur => "regexName();" %> -

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

+

+

+ +

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

<% time = (Time.now + 3600 * 24).strftime('%Y-%m-%d') %> -

<%= f.text_field(:deadline, :required => true, :size => 60, :style => "width:150px;",:value => "#{time}",:readonly => "readonly") %><%= calendar_for('bid_deadline')%> +

<%= f.text_field(:deadline, :required => true, :size => 60, :style => "width:150px;",:value => "#{time}", :onchange => "regexDeadLine();") %><%= calendar_for('bid_deadline')%> + + +

<%= f.select :is_evaluation, is_evaluation_option %>

diff --git a/app/views/courses/new_homework.html.erb b/app/views/courses/new_homework.html.erb index b3fff9e5f..e339db2d7 100644 --- a/app/views/courses/new_homework.html.erb +++ b/app/views/courses/new_homework.html.erb @@ -1,9 +1,60 @@ + +

<%=l(:label_course_new_homework)%>

<%= labelled_form_for @homework, :url => {:controller => 'bids', :action => 'create_homework',:course_id => "#{params[:id] || params[:course_id]}"} do |f| %>
<%= render :partial => 'homework_form', :locals => { :f => f } %> - <%= submit_tag l(:button_create), :class => "enterprise" %> + <%= javascript_tag "$('#bid_name').focus();" %> <% end %>
\ No newline at end of file diff --git a/app/views/files/_course_sort_by_attachtypel.html.erb b/app/views/files/_course_sort_by_attachtypel.html.erb index f0f6c8270..c13d76620 100644 --- a/app/views/files/_course_sort_by_attachtypel.html.erb +++ b/app/views/files/_course_sort_by_attachtypel.html.erb @@ -37,7 +37,7 @@ <%= number_to_human_size(file.filesize) %> - <%= file.attachmentstype.typeName %> + <%= file.attachmentstype.nil? ? l(:lable_unknow_type):file.attachmentstype.typeName %>   <%= render :partial => 'attachments/course_type_edit', :locals => {:attachmenttypes => attachmenttypes, diff --git a/app/views/files/_sort_by_attachtypel.html.erb b/app/views/files/_sort_by_attachtypel.html.erb index d3723c340..eb7ffffec 100644 --- a/app/views/files/_sort_by_attachtypel.html.erb +++ b/app/views/files/_sort_by_attachtypel.html.erb @@ -37,7 +37,7 @@ <%= number_to_human_size(file.filesize) %> - <%= file.attachmentstype.typeName %> + <%= file.attachmentstype.nil? ? l(:lable_unknow_type):file.attachmentstype.typeName %>   <%= render :partial => 'attachments/type_edit', :locals => {:attachmenttypes => attachmenttypes, diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index f5018fc94..2446c4e3d 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -37,21 +37,21 @@ - <%# messages_count = @user.messages.count %> - <%# messages_score = messages_count * 0.05%> - <%# finall_messages_score = messages_score %> - - <%# journals_count = @user.journals.count %> - <%# journals_score = journals_count * 0.1 %> - <%# user_changesets_count = @user.changesets.count %> - <%# user_changesets_score = user_changesets_count * 0.3 %> - <%# finall_user_project_score = journals_score + user_changesets_score %> - - <%# journals_for_messages_count = @user.journals_messages.count %> - <%# activities_count = @user.activities.count %> - <%# journals_for_messages_score = journals_for_messages_count * 0.05 %> - <%# activities_score = activities_count * 0.2 %> - <%# finall_activity_score = journals_for_messages_score + activities_score %> - - <%# news_count = @user.news.count %> - <%# news_score = news_count * 0.1 %> - <%# wiki_contents_count = @user.wiki_contents.count %> - <%# wiki_contents_score = wiki_contents_count * 0.1 %> - <%# comments_count = @user.comments.count %> - <%# comments_score = comments_count * 0.1 %> - <%# finall_influence_score = news_score + wiki_contents_score + comments_score %> - <%# finall_user_score = finall_messages_score + finall_user_project_score + finall_activity_score + finall_influence_score %> - -
<%= render :partial => 'users/user_score', :locals => {:user => @user}%> diff --git a/app/views/messages/_form.html.erb b/app/views/messages/_form.html.erb index 44d6dfbe4..a8def56f5 100644 --- a/app/views/messages/_form.html.erb +++ b/app/views/messages/_form.html.erb @@ -32,7 +32,7 @@ <%= f.select :board_id, boards_options_for_select(@message.course.boards) %>

<% end %> <% end %> -
+
<%= text_area :quote,:quote,:style => 'display:none' %>

diff --git a/app/views/messages/edit.html.erb b/app/views/messages/edit.html.erb index 2577a4634..62d29ebd8 100644 --- a/app/views/messages/edit.html.erb +++ b/app/views/messages/edit.html.erb @@ -4,7 +4,7 @@ <%= course_board_breadcrumb(@message) %> <% end %> -

<%= avatar(@topic.author, :size => "24") %><%=h @topic.subject %>

+

<%= avatar(@topic.author, :size => "24") %><%=h @topic.subject %>

<%= form_for @message, { :as => :message, diff --git a/app/views/praise_tread/_praise_tread.html.erb b/app/views/praise_tread/_praise_tread.html.erb index e0ad6fd9b..696b204f9 100644 --- a/app/views/praise_tread/_praise_tread.html.erb +++ b/app/views/praise_tread/_praise_tread.html.erb @@ -38,15 +38,28 @@ <% else %> - - - - - - -
<%= link_to image_tag("/images/praise_tread/praise_true.png",weight:"22px", height:"22px",:title => l(:label_issue_praise)), - :controller=>"praise_tread",:action=>"praise_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class,:horizontal => horizontal %> <%= get_praise_num(obj)%> <%= link_to image_tag("/images/praise_tread/tread_true.png",weight:"22px", height:"22px",:title => l(:label_issue_tread)),:controller=>"praise_tread", - :action=>"tread_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class,:horizontal => horizontal %>
+ + <% if OptionNumber.get_user_option_number(user_id).nil? || OptionNumber.get_user_option_number(user_id).total_score < 2 %> + + + + + + +
<%= link_to image_tag("/images/praise_tread/praise_true.png",weight:"22px", height:"22px",:title => l(:label_issue_praise)), + :controller=>"praise_tread",:action=>"praise_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class,:horizontal => horizontal %><%= get_praise_num(obj)%><%= image_tag "/images/praise_tread/tread_true.png",weight:"22px", height:"22px",:title => l(:label_issues_score_not_enough) %>
+ <% else %> + + + + + + +
<%= link_to image_tag("/images/praise_tread/praise_true.png",weight:"22px", height:"22px",:title => l(:label_issue_praise)), + :controller=>"praise_tread",:action=>"praise_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class,:horizontal => horizontal %> <%= get_praise_num(obj)%> <%= link_to image_tag("/images/praise_tread/tread_true.png",weight:"22px", height:"22px",:title => l(:label_issue_tread)),:controller=>"praise_tread", + :action=>"tread_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class,:horizontal => horizontal %>
+ <% end %> + <% end %> @@ -105,19 +118,36 @@ <% else %> - - - - - - - - - - -
<%= link_to image_tag("/images/praise_tread/praise_true.png",weight:"22px", height:"22px",:title => l(:label_issue_praise)), - :controller=>"praise_tread",:action=>"praise_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class ,:horizontal => horizontal %>
<%= get_praise_num(obj)%>
<%= link_to image_tag("/images/praise_tread/tread_true.png",weight:"22px", height:"22px",:title => l(:label_issue_tread)),:controller=>"praise_tread", - :action=>"tread_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class ,:horizontal => horizontal %>
+ <% if OptionNumber.get_user_option_number(user_id).nil? || OptionNumber.get_user_option_number(user_id).total_score < 2 %> + + + + + + + + + + + +
<%= link_to image_tag("/images/praise_tread/praise_true.png",weight:"22px", height:"22px",:title => l(:label_issue_praise)), + :controller=>"praise_tread",:action=>"praise_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class ,:horizontal => horizontal %>
<%= get_praise_num(obj)%>
<%= image_tag "/images/praise_tread/tread_true.png",weight:"22px", height:"22px",:title => l(:label_issues_score_not_enough) %>
+ <% else %> + + + + + + + + + + +
<%= link_to image_tag("/images/praise_tread/praise_true.png",weight:"22px", height:"22px",:title => l(:label_issue_praise)), + :controller=>"praise_tread",:action=>"praise_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class ,:horizontal => horizontal %>
<%= get_praise_num(obj)%>
<%= link_to image_tag("/images/praise_tread/tread_true.png",weight:"22px", height:"22px",:title => l(:label_issue_tread)),:controller=>"praise_tread", + :action=>"tread_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class ,:horizontal => horizontal %>
+ <% end %> + <% end %> diff --git a/app/views/projects/_project.html.erb b/app/views/projects/_project.html.erb index 92e20f9e4..004fb38ac 100644 --- a/app/views/projects/_project.html.erb +++ b/app/views/projects/_project.html.erb @@ -46,7 +46,7 @@ - <%= content_tag('span', "#{changesets_num(@project)}", :class => "info") %> + <%= content_tag('span', "#{get_project_score(@project).nil? ? 0:get_project_score(@project).changeset_num}", :class => "info") %> <%= content_tag('span', l(:label_commit_on)) %> @@ -87,7 +87,7 @@ <% end %>
-
+
<% if(@project.project_type==1)%> diff --git a/app/views/projects/feedback.html.erb b/app/views/projects/feedback.html.erb index 8e36b8c59..f9182c544 100644 --- a/app/views/projects/feedback.html.erb +++ b/app/views/projects/feedback.html.erb @@ -85,7 +85,7 @@ function checkMaxLength() { <% if User.current.logged? %> <% if journal.user_id==User.current.id|| User.current.admin? %> <%= link_to(l(:button_delete),{:controller => 'words', :action => 'destroyJournal', :object_id => journal.id, :project_id=>@project.id, :page=>@page}, - :remote => true, :title => l(:button_delete)) %> + :remote => true, :title => l(:button_delete), :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete") %> <% end %> <% end %> diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 7b8ed310e..47e3e8419 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -7,7 +7,7 @@ <% @events_by_day.keys.sort.reverse.each do |day| %> <% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%> -
+
<%= image_tag(url_to_avatar(e.event_author), :class => "avatar") %>
diff --git a/app/views/tags/_tag.html.erb b/app/views/tags/_tag.html.erb index 2e9b3d217..b20b383ef 100644 --- a/app/views/tags/_tag.html.erb +++ b/app/views/tags/_tag.html.erb @@ -52,7 +52,7 @@ <%= l(:label_tag) %>: <% if User.current.logged? %> - <%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form', {:focus => 'name'} %> + <%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form', {:focus => 'tags_name'} %> <% end %>
@@ -62,7 +62,7 @@ <%= form_for "tag_for_save",:remote=>true,:url=>tag_path, :update => "tags_show", :complete => '$("#put-tag-form").hide();' do |f| %> - <%= f.text_field :name ,:id => "name",:size=>"28",:require=>true,:maxlength => Setting.tags_max_length,:minlength=>Setting.tags_min_length %> + <%= f.text_field :name ,:id => "tags_name",:size=>"28",:require=>true,:maxlength => Setting.tags_max_length,:minlength=>Setting.tags_min_length %> <%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%> <%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%> <%= f.submit l(:button_project_tags_add),:class => "small" %> diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb index 38b8ac85c..01889f1f3 100644 --- a/app/views/tags/_tag_name.html.erb +++ b/app/views/tags/_tag_name.html.erb @@ -22,7 +22,7 @@ <% i += 1 %> <% end %> - <%= link_to l(:label_more_tags), :action => "show", :id => obj.id %> + <%= link_to l(:label_more_tags),:controller => "tags", :action => "show", :id => obj.id %> <% else %> diff --git a/app/views/trackers/_form.html.erb b/app/views/trackers/_form.html.erb index 9039bba68..5acd0da1b 100644 --- a/app/views/trackers/_form.html.erb +++ b/app/views/trackers/_form.html.erb @@ -1,6 +1,6 @@ <%= error_messages_for 'tracker' %> -
+

<%= f.text_field :name, :required => true %>

@@ -39,14 +39,27 @@ <%= submit_tag l(@tracker.new_record? ? :button_create : :button_save) %>
-
+
<% if @projects.any? %>
<%= l(:label_project_plural) %> +
<%= render_project_nested_lists(@projects) do |p| content_tag('label', check_box_tag('tracker[project_ids][]', p.id, @tracker.projects.include?(p), :id => nil) + ' ' + h(p)) end %> +
<%= hidden_field_tag('tracker[project_ids][]', '', :id => nil) %> +

<%= check_all_links 'tracker_project_ids' %>

+
<% end %> +
diff --git a/app/views/users/_score_new_index.html.erb b/app/views/users/_score_new_index.html.erb index 539c55f80..b79a57e71 100644 --- a/app/views/users/_score_new_index.html.erb +++ b/app/views/users/_score_new_index.html.erb @@ -6,5 +6,9 @@
= <%= format("%.2f" ,collaboration(option_num)).to_i %> + <%= format("%.2f" , influence(option_num) ).to_i %> + <%= "(" if skill(option_num) < 0 %> <%= format("%.2f" , skill(option_num)).to_i %> <%= ")" if skill(option_num) < 0 %> + <%= format("%.2f" , active(option_num)).to_i %>
-
= <%= format("%.2f" ,option_num.total_score).to_i %>
+ <% if (format("%.2f" ,collaboration(option_num)).to_i + format("%.2f" , influence(option_num) ).to_i + format("%.2f" , skill(option_num)).to_i + format("%.2f" , active(option_num)).to_i) < 0 %> +
<%= l(:lable_score_less_than_zero) %>
+ <% else %> +
= <%= format("%.2f" ,option_num.total_score).to_i %>
+ <% end %> diff --git a/app/views/users/_user_show.html.erb b/app/views/users/_user_show.html.erb index 3afdb8d96..d0c9e204b 100644 --- a/app/views/users/_user_show.html.erb +++ b/app/views/users/_user_show.html.erb @@ -1,32 +1,6 @@
<% for user in @users -%> - - <% messages_count = user.messages.count %> - <% messages_score = messages_count * 0.05%> - <% finall_messages_score = messages_score %> - - <% journals_count = user.journals.count %> - <% journals_score = journals_count * 0.1 %> - <% user_changesets_count = user.changesets.count %> - <% user_changesets_score = user_changesets_count * 0.3 %> - <% finall_user_project_score = journals_score + user_changesets_score %> - - <% journals_for_messages_count = user.journals_messages.count %> - <% activities_count = user.activities.count %> - <% journals_for_messages_score = journals_for_messages_count * 0.05 %> - <% activities_score = activities_count * 0.2 %> - <% finall_activity_score = journals_for_messages_score + activities_score %> - - <% news_count = user.news.count %> - <% news_score = news_count * 0.1 %> - <% wiki_contents_count = user.wiki_contents.count %> - <% wiki_contents_score = wiki_contents_count * 0.1 %> - <% comments_count = user.comments.count %> - <% comments_score = comments_count * 0.1 %> - <% finall_influence_score = news_score + wiki_contents_score + comments_score %> - <% finall_user_score = finall_messages_score + finall_user_project_score + finall_activity_score + finall_influence_score %> -
<%= content_tag "p", "#{format_date(user.created_on)} #{l(:label_member_since)}", :class => "float_right member_since" %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index b70d73eb6..068390192 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -72,7 +72,7 @@ <% end %> -

<%= textilizable act.notes %>

+

<%= textAreailizable act.notes %>

<%= link_to(l(:label_goto), user_newfeedback_user_path(e.user_id)) %>
@@ -113,7 +113,7 @@ -

<%= act.description.html_safe %>

+

<%=textAreailizable act, :description %>

@@ -141,7 +141,7 @@ <% if act.notes.nil? %> <% desStr = '' %> <% else %> - <% desStr=act.notes.html_safe %> + <% desStr= textAreailizable(act, :notes) %> <% end %>

<%= desStr %>

@@ -168,7 +168,7 @@ -

<%= act.long_comments.html_safe %>

+

<%= textAreailizable act,:long_comments %>

@@ -194,7 +194,7 @@ -

<%= h act.content.truncate(240, omission: '...') %>

+

<%= textAreailizable(act,:content) %>

@@ -242,7 +242,7 @@ -

<%= act.description.html_safe %>

+

<%= textAreailizable act,:description %>

@@ -287,7 +287,7 @@
--> - <%= textilizable act, :description %> + <%= textAreailizable act, :description %> @@ -314,7 +314,7 @@ <% end %> -

<%= h act.description %>

+

<%= textAreailizable act, :description %>

@@ -384,7 +384,7 @@ -

<%= textilizable e.notes %>

+

<%= textAreailizable e.notes %>

diff --git a/app/views/users/user_activities.html.erb b/app/views/users/user_activities.html.erb index 2b4cf8819..080e772a1 100644 --- a/app/views/users/user_activities.html.erb +++ b/app/views/users/user_activities.html.erb @@ -13,7 +13,7 @@ <%# end -%> <%# end -%> - +
<%# end %> --> diff --git a/app/views/wiki/diff.html.erb b/app/views/wiki/diff.html.erb index c1062924c..ef26c570c 100644 --- a/app/views/wiki/diff.html.erb +++ b/app/views/wiki/diff.html.erb @@ -22,6 +22,6 @@ %>, <%= format_time(@diff.content_to.updated_on) %>)

-
+
<%= simple_format_without_paragraph @diff.to_html %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index 602e7a659..ddae72799 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1807,3 +1807,5 @@ en: label_company_name: Company Name notice_account_invalid_creditentials_new: You have not to the mailbox activation + lable_unknow_type: Unknow type + lable_score_less_than_zero: Score less than 0, revised to 0 \ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 4f0744d86..2fb7ef2bf 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1214,7 +1214,7 @@ zh: notice_issue_successful_create: 问题 %{id} 已创建。 label_between: 介于 setting_issue_group_assignment: 允许问题被分配给组 - label_diff: diff + label_diff: 查看差别 description_query_sort_criteria_direction: 排序方式 description_project_scope: 搜索范围 description_filter: 过滤器 @@ -1589,6 +1589,7 @@ zh: label_issue_tread_over: 我刚才踩过了~ label_issue_not_praise_over: 不能顶自己~ label_issue_not_treed_over: 不能踩自己~ + label_issues_score_not_enough: 积分不够，不能踩别人~ #end label_goto: 前往>> label_issue_appraise_over: 只能评价一次哦！ @@ -2113,4 +2114,6 @@ zh: lable_memos_max_length: 帖子内容最大长度为65535个字符 lable_forums_max_length: 贴吧描述最大长度为65535个字符 + lable_unknow_type: 未知类型 + lable_score_less_than_zero: 得分小于0，修正为0 \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index ed9001ee2..33b5cd16a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -652,6 +652,7 @@ RedmineApp::Application.routes.draw do post 'words/append', :to => 'words#append' post 'words/create_reply', :to => 'words#create_reply' delete 'words/destroy', :to => 'words#destroy' + delete 'words/destroyJournal', :to => 'words#destroyJournal' get 'words/more', :to => 'words#more' get 'words/back', :to=> 'words#back' get 'words/destroyJournal', :to => 'words#destroyJournal' diff --git a/db/migrate/20140826072838_project_score_add_cloumn.rb b/db/migrate/20140826072838_project_score_add_cloumn.rb new file mode 100644 index 000000000..1792273c1 --- /dev/null +++ b/db/migrate/20140826072838_project_score_add_cloumn.rb @@ -0,0 +1,19 @@ +class ProjectScoreAddCloumn < ActiveRecord::Migration + def up + add_column("project_scores","issue_num",:integer,:default => 0) + add_column("project_scores","issue_journal_num",:integer,:default => 0) + add_column("project_scores","news_num",:integer,:default => 0) + add_column("project_scores","documents_num",:integer,:default => 0) + add_column("project_scores","changeset_num",:integer,:default => 0) + add_column("project_scores","board_message_num",:integer,:default => 0) + end + + def down + remove_column("project_scores","issue_num") + remove_column("project_scores","issue_journal_num") + remove_column("project_scores","news_num") + remove_column("project_scores","documents_num") + remove_column("project_scores","changeset_num") + remove_column("project_scores","board_message_num") + end +end diff --git a/db/schema.rb b/db/schema.rb index 525cfb745..1307dd913 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20140814062455) do +ActiveRecord::Schema.define(:version => 20140826072838) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -437,9 +437,9 @@ ActiveRecord::Schema.define(:version => 20140814062455) do t.string "web_title" t.string "title" t.text "description" - t.string "page_type" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false + t.string "page_type" t.integer "sort_type" t.integer "show_course", :default => 1 t.integer "show_contest", :default => 1 @@ -458,6 +458,26 @@ ActiveRecord::Schema.define(:version => 20140814062455) do t.datetime "updated_at", :null => false end + create_table "gitlab_projects", :force => true do |t| + t.integer "gitlab_project_id" + t.integer "project_id" + t.string "repository_url" + t.string "web_url" + t.string "localfile_url" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "gitlab_users", :force => true do |t| + t.integer "gitlab_user_id" + t.integer "user_id" + t.string "email" + t.string "password" + t.string "login", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "groups_users", :id => false, :force => true do |t| t.integer "group_id", :null => false t.integer "user_id", :null => false @@ -793,8 +813,14 @@ ActiveRecord::Schema.define(:version => 20140814062455) do create_table "project_scores", :force => true do |t| t.string "project_id" t.integer "score" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "issue_num", :default => 0 + t.integer "issue_journal_num", :default => 0 + t.integer "news_num", :default => 0 + t.integer "documents_num", :default => 0 + t.integer "changeset_num", :default => 0 + t.integer "board_message_num", :default => 0 end create_table "project_statuses", :force => true do |t| diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 9d1a6bc93..5f4a3166e 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -1634,7 +1634,7 @@ fieldset#filters td.field { width:230px; } fieldset#filters td.operator { width:180px; } fieldset#filters td.operator select {max-width:170px;} fieldset#filters td.values { white-space:nowrap; } -fieldset#filters td.values select {min-width:130px;} +fieldset#filters td.values select {min-width:130px;max-width: 220px;} fieldset#filters td.values input {height:1em;} fieldset#filters td.add-filter { text-align: right; vertical-align: top; } @@ -1725,8 +1725,8 @@ ul.projects li {list-style-type:none; #projects-index ul.projects div.root a.project {font-family:'微软雅黑', "Trebuchet MS", Verdana, sans-serif; font-weight: bold; font-size: 14px; margin: 0 0 10px 0; } .my-project { padding-left: 18px; background: url(../images/fav.png) no-repeat 0 50%; } -#notified-projects ul, #tracker_project_ids ul {max-height:250px; overflow-y:auto;} - +#notified-projects ul{max-height:250px; overflow-y:auto;} +#tracker_project_ids ul {max-height:250px; /*overflow-y:auto;*/} #related-issues li img {vertical-align:middle;} ul.properties {padding:0; font-size: 0.9em; color: #777;} diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css index 9baa5526c..098e02be2 100644 --- a/public/themes/redpenny-master/stylesheets/application.css +++ b/public/themes/redpenny-master/stylesheets/application.css @@ -1071,14 +1071,14 @@ overflow: hidden; .information { margin-top: 20px; margin-left: 690px; - float: left; + /*float: left;*/ height: auto; width: 280px; font-family: '微软雅黑',helvetica,arial,sans-serif; /*modify by men*/ color: rgb(0, 0, 0); font-size: 13px; line-height: 18px; - position: absolute; + /*position: absolute;*/ } /* a.project { @@ -1216,6 +1216,15 @@ p.stats { padding-top: 10px; } +.add-info-project { + /*float: left;*/ + margin-top: 0px; + height: 20px; + width: 908px; + margin-bottom: 5px; + padding-top: 10px; +} + .main-language { float: left; height: 18px;