diff --git a/.gitignore b/.gitignore
index 9d33b264c..601f691a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@ public/javascripts/wechat/node_modules/
.access_token
tmux*.log
config/wechat.yml
+config/oneapm.yml
diff --git a/app/controllers/blogs_controller.rb b/app/controllers/blogs_controller.rb
index eeea2d01a..8c6cc4f0c 100644
--- a/app/controllers/blogs_controller.rb
+++ b/app/controllers/blogs_controller.rb
@@ -26,7 +26,7 @@ class BlogsController < ApplicationController
@type = 2
@topics.each do |topic|
- topic[:infocount] = get_praise_num(topic) + (topic.parent ? topic.parent.children.count : topic.children.count)
+ topic[:infocount] = get_praise_num(topic) + BlogComment.where("root_id = #{topic.id}").count
if topic[:infocount] < 0
topic[:infocount] = 0
end
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index a137b7cd1..c6cb018a5 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -102,6 +102,7 @@ class IssuesController < ApplicationController
@issue_count = @query.issue_count
@test = params[:test]
@project_sort = 'issues.updated_on desc'
+
if params[:test] != "0"
case @test
when "1"
@@ -284,11 +285,11 @@ class IssuesController < ApplicationController
# 用户编辑更改issue
def update
- # params[:assigned_to_id] = nil if params[:assigned_to_id].to_i == 0
+ # params[:assigned_to_id] = nil if params[:assigned_to_id].to_i == 0
+ # params[:fixed_version_id] = nil if params[:fixed_version_id].to_i == 0
if params[:issue_detail]
issue = Issue.find(params[:id])
issue = update_user_issue_detail(issue, params)
- @issue.assigned_to_id = nil if @issue.assigned_to_id == 0
@saved = update_user_issue_detail(issue, params)
return
else
@@ -296,6 +297,7 @@ class IssuesController < ApplicationController
return unless update_issue_from_params
@issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
@issue.assigned_to_id = nil if @issue.assigned_to_id == 0
+ @issue.fixed_version_id = nil if @issue.fixed_version_id == 0
saved = false
begin
@saved = @issue.save_issue_with_child_records(params, @time_entry)
@@ -630,7 +632,9 @@ class IssuesController < ApplicationController
end
end
# 搜索结果
- @issues_filter = @query.issues(:order => @project_sort)
+ # SELECT assigned_to_id, count(*) as ac FROM `issues` where project_id = @project.id group by assigned_to_id order by ac desc;
+ @issues_filter = @query.issues.sort_by{ |i| Issue.where(:project_id => @project.id , :assigned_to_id => i.assigned_to_id).count }.reverse
+ # @issues_filter = @query.issues(:order => @project_sort)
# if params[:type] == 1 || params[:type].nil?
# @results = @issues_filter
@@ -668,7 +672,7 @@ class IssuesController < ApplicationController
@alltotal[issue.tracker_id.to_i] = @alltotal[issue.tracker_id.to_i] + 1
user_id = issue.assigned_to_id
if issue.assigned_to_id.nil?
- user_id = issue.author_id
+ user_id = 0
end
if !@results[user_id].nil?
@@ -696,7 +700,7 @@ class IssuesController < ApplicationController
tmpuser = User.find(user_id)
- @results[user_id][:name] = tmpuser.nil? ? " " : tmpuser.show_name
+ @results[user_id][:name] = tmpuser.nil? ? "" : tmpuser.show_name
#所有的
@results[user_id][0] = 1
for i in 1..17 do
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 4e9829d62..13a1a1e58 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
# Redmine - project management software
# Copyright (C) 2006-2013 Jean-Philippe Lang
#
@@ -808,13 +809,13 @@ class ProjectsController < ApplicationController
if @is_true
begin
g = Gitlab.client
+ g.delete_project(@project.gpid)
@gitlab_repository.destroy
@gitlab_repository = nil
- @project.update_attribute(:gpid, nil)
scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
@repository = Repository.factory(scm)
@repository.is_default = @project.repository.nil?
- g.delete_project(@project.gpid)
+ @project.update_attribute(:gpid, nil)
rescue Exception => e
puts e
end
diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index e481b09a6..a71f9c105 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -92,10 +92,10 @@ class PullRequestsController < ApplicationController
if compare_pull_request(source_branch, target_project_id, target_branch)
# 如果传送了目标项目ID即向fork源项目发送请求
# if params[:forked_project_id] && params[:source_project] == "forked_project_name"
- if params[:target_project_id]
+ if params[:target_project_id].to_i != @project.id
target_project_id = params[:forked_project_id].to_i
request = @g.create_merge_request(@project.gpid, title, User.current.gid, :description => description, :source_branch => source_branch, :target_branch => target_branch, :target_project_id => target_project_id)
- @fork_project_name = Project.find(target_project_id).try(:name)
+ @fork_project_name = Project.find(params[:target_project_id]).try(:name)
@fork_pr_message = true if @fork_project_name
else
request = @g.create_merge_request(@project.gpid, title, User.current.gid, :description => description, :source_branch => source_branch, :target_branch => target_branch)
@@ -109,7 +109,7 @@ class PullRequestsController < ApplicationController
format.js{redirect_to new_project_pull_request_path(:show_tip => tip)}
end
end
- rescue Exception => e
+ rescue Gitlab::Error::Conflict => e
@message = e.message
end
end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 56b536d30..049789115 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1369,9 +1369,10 @@ class UsersController < ApplicationController
@jour = jours.limit(10).offset(@page * 10)
@type = params[:type]
if User.current == @user
- jours.update_all(:is_readed => true, :status => false)
- jours.each do |journal|
- fetch_user_leaveWord_reply(journal).update_all(:is_readed => true, :status => false)
+ @jour.update_all(:is_readed => true, :status => false)
+ @jour.each do |journal|
+ # fetch_user_leaveWord_reply(journal).update_all(:is_readed => true, :status => false)
+ journal.delay.set_children_readed_delay
end
end
@state = false
diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb
index da0c5733a..6f0d96dfa 100644
--- a/app/controllers/watchers_controller.rb
+++ b/app/controllers/watchers_controller.rb
@@ -37,7 +37,9 @@ class WatchersController < ApplicationController
@list = query.order("#{Watcher.table_name}.id desc").limit(limit).offset(@obj_pages.offset).all();
@action = 'fans'
else
-
+ if params[:target_id]
+ @user = User.find(params[:target_id])
+ end
end
if params[:object_type] == 'project'
@@ -78,6 +80,9 @@ class WatchersController < ApplicationController
@list = query.order("#{Watcher.table_name}.id desc").limit(limit).offset(@obj_pages.offset).all();
@action = 'fans'
else
+ if params[:target_id]
+ @user = User.find(params[:target_id])
+ end
end
if params[:object_type] == 'project'
@project = Project.find(params[:object_id])
diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index a082d72ff..654f83855 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -137,7 +137,7 @@ class WechatsController < ActionController::Base
on :fallback, respond: 'fallback message'
on :click, with: 'FEEDBACK' do |request, key|
- request.reply.text "如有问题反馈，请您：\n1、直接切换至输入框，发微信给我们。\n2、加入QQ群：373967360，直接互动。\n\n如您有合作事宜洽谈，请联系：\n王林春 老师\n手机：13467631747\nQQ：494496321"
+ request.reply.text "如有问题反馈，请您：\n1、直接切换至输入框，发微信给我们。\n2、加入QQ群：373967360，直接互动。\n3、登录网站：www.trustie.net，给我们留言。\n\n如您有合作事宜洽谈，请联系：\n王林春 老师\n手机：13467631747\nQQ：494496321"
end
on :click, with: 'MY_NEWS' do |request, key|
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index fb757665f..653afef62 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -267,6 +267,16 @@ module ProjectsHelper
project_name = versions.blank? ? "" : versions.first.project.name
grouped = Hash.new {|h,k| h[k] = []}
grouped[project_name] << ["请选择里程碑", 0]
+
+=begin
+ unless selected.nil?
+ if (params[:action] == "show" ) && Version.find(selected.id).status == "closed"
+ version_name = Version.find(selected.id).name
+ grouped[project_name] << [version_name, selected.id]
+ end
+ end
+=end
+
versions.each do |version|
grouped[version.project.name] << [version.name, version.id]
end
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 228e83080..4dd3399a3 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -100,7 +100,7 @@ module UsersHelper
def applied_project_users applied_message
# case applied_message.status
# when 3,2,1,5,4,7,6
- user = User.find(applied_message.applied_user_id)
+ user = User.find(applied_message.applied_user_id).show_name
# end
end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 1b47d80cc..46a42cb34 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -854,7 +854,8 @@ class Issue < ActiveRecord::Base
return @assignable_versions if @assignable_versions
# versions = project.shared_versions.open.all
- versions = Version.where(:project_id => project.id, :status => "open").order("created_on desc")
+ # versions = Version.where(:project_id => project.id, :status => "open").order("created_on desc")
+ versions = Version.where(:project_id => project.id).order("created_on desc")
if fixed_version
if fixed_version_id_changed?
# nothing to do
diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index 4a9601d07..aa83c2210 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -344,4 +344,9 @@ class JournalsForMessage < ActiveRecord::Base
def content_detail
self.notes
end
+
+ def set_children_readed_delay
+ # fetch_user_leaveWord_reply(self).update_all(:is_readed => true, :status => false)
+ end
+
end
diff --git a/app/models/organization.rb b/app/models/organization.rb
index 50f62ea11..284754c03 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -9,6 +9,7 @@ class Organization < ActiveRecord::Base
has_many :org_subfields, :dependent => :destroy
has_many :users, :through => :org_members
has_many :files
+ has_many :org_messages, :class_name => 'OrgMessage', :dependent => :destroy
acts_as_attachable
validates_uniqueness_of :name
after_create :save_as_org_activity, :add_default_subfields
diff --git a/app/views/attachments/_project_file_links.html.erb b/app/views/attachments/_project_file_links.html.erb
index cccc8382c..a1a978a48 100644
--- a/app/views/attachments/_project_file_links.html.erb
+++ b/app/views/attachments/_project_file_links.html.erb
@@ -30,9 +30,9 @@
<% for attachment in attachments %>
<div style="float:left;">
<p style="height:14px;line-height:12px;width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
- <%if is_float%>
- <div style="max-width:55%;white-space: nowrap; overflow: hidden; text-overflow: ellipsis;float: left;">
- <% end%>
+ <% if is_float %>
+ <div style="max-width:55%;white-space: nowrap; overflow: hidden; text-overflow: ellipsis;float: left;">
+ <% end %>
<span title="<%= attachment.filename %>" id = "attachment_">
<% if options[:length] %>
<% if User.current.logged? %>
@@ -42,15 +42,15 @@
<% end %>
<% else %>
<% if User.current.logged? %>
- <%= link_to_short_attachment attachment, :length=> 58,:class => 'hidden link_file_a fl newsBlue mw400', :download => true -%>
+ <%= link_to_short_attachment attachment, :length => 58,:class => 'hidden link_file_a fl newsBlue mw400 h15', :download => true -%>
<% else %>
- <%= link_to(attachment.filename, signin_url_without_domain,:length=> 58, :class => "hidden link_file_a fl newsBlue mw400") %>
+ <%= link_to(attachment.filename, signin_url_without_domain,:length => 58, :class => "hidden link_file_a fl newsBlue mw400 h15") %>
<% end %>
<% end %>
</span>
- <%if is_float%>
+ <% if is_float %>
</div>
- <% end%>
+ <% end %>
<% if attachment.is_text? %>
<%= link_to image_tag('magnifier.png'),
diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb
index 02ae7f677..94b55f3e2 100644
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@@ -98,8 +98,8 @@
<li class=" clear" style="border:1px solid #c8c8c8;">
<% if @issue.safe_attribute? 'start_date' %>
<%= f.text_field :start_date, :size => 22, :disabled => !@issue.leaf?, :no_label => true,
- :required => @issue.required_attribute?('start_date'), :onchange=>"issue_start_date_change();",
- :class=>"fl calendar_input", :style=>"width:170px;" %>
+ :required => @issue.required_attribute?('start_date'), :onchange => "issue_start_date_change();",
+ :class => "fl calendar_input", :style => "width:170px;" %>
<%= calendar_for('issue_start_date', 'start_date') if @issue.leaf? %>
<% end %>
</li>
@@ -110,8 +110,8 @@
<label class="label02" ></label>
<% if @issue.safe_attribute? 'due_date' %>
<%= f.text_field :due_date, :size => 22, :disabled => !@issue.leaf?, :no_label => true,
- :required => @issue.required_attribute?('due_date'), :onchange=>"issue_end_date_change();",
- :class=>"fl calendar_input",:style=>"width: 170px;", :placeholder=> "请选择结束日期" %>
+ :required => @issue.required_attribute?('due_date'), :onchange => "issue_end_date_change();",
+ :class => "fl calendar_input",:style => "width: 170px;", :placeholder => "请选择结束日期" %>
<%= calendar_for('issue_due_date', 'start_date') if @issue.leaf? %>
<% end %>
</li>
@@ -121,7 +121,7 @@
<li class=" clear">
<% if @issue.safe_attribute? 'estimated_hours' %>
<%= f.text_field :estimated_hours, :size => 22, :disabled => !@issue.leaf?, :no_label => true,
- :required => @issue.required_attribute?('estimated_hours'), :placeholder=> "请填写预计工时" %>
+ :required => @issue.required_attribute?('estimated_hours'), :placeholder => "请填写预计工时" %>
<% end %>
</li>
<li class=" clear"><%= l(:field_estimated_hours) %></li>
@@ -160,9 +160,5 @@
}
// 里程碑添加默认选项
$("#issue_fixed_version_id option[value='']").remove();
- <%# if params[:action] == "new" %>
-// $('#issue_fixed_version_id').prepend("<option value='0' selected='selected'>选择里程碑</option>");
- <%# else %>
-// $('#issue_fixed_version_id').prepend("<option value='0'>选择里程碑</option>");
- <%# end %>
+
</script>
diff --git a/app/views/issues/_statistics_all.html.erb b/app/views/issues/_statistics_all.html.erb
index 0ef85057a..b9b593b91 100644
--- a/app/views/issues/_statistics_all.html.erb
+++ b/app/views/issues/_statistics_all.html.erb
@@ -11,9 +11,18 @@
</tr>
</thead>
<tbody>
+ <tr>
+ <td class="hidden dis p10" style="width:166px;">合计</td>
+ <td class="w130"><%= @alltotal[0] %></td>
+ <td class="w130"><%= @alltotal[2] %></td>
+ <td class="w130"><%= @alltotal[4] %></td>
+ <td class="w130"><%= @alltotal[1] %></td>
+ <td class="w130"><%= @alltotal[3] %></td>
+ <td class="w130"><%= @alltotal[5] %></td>
+ </tr>
<% @results.each do |k,v|%>
<tr>
- <td class="hidden dis p10" style="width:166px;"><%= v[:name] %></td>
+ <td class="hidden dis p10" style="width:166px;"><%= v[:name] =="Anonymous" ? "未指派" : v[:name] %></td>
<td class="w130"><%= v[0] %></td>
<td class="w130"><%= v[2] %></td>
<td class="w130"><%= v[4] %></td>
@@ -22,14 +31,5 @@
<td class="w130"><%= v[5] %></td>
</tr>
<% end %>
- <tr>
- <td class="hidden dis p10" style="width:166px;">Total</td>
- <td class="w130"><%= @alltotal[0] %></td>
- <td class="w130"><%= @alltotal[2] %></td>
- <td class="w130"><%= @alltotal[4] %></td>
- <td class="w130"><%= @alltotal[1] %></td>
- <td class="w130"><%= @alltotal[3] %></td>
- <td class="w130"><%= @alltotal[5] %></td>
- </tr>
</tbody>
</table>
\ No newline at end of file
diff --git a/app/views/issues/_statistics_lock.html.erb b/app/views/issues/_statistics_lock.html.erb
index f8628144e..edcd9b090 100644
--- a/app/views/issues/_statistics_lock.html.erb
+++ b/app/views/issues/_statistics_lock.html.erb
@@ -11,10 +11,19 @@
</tr>
</thead>
<tbody>
+ <tr>
+ <td class="hidden dis p10" style="width:166px;">合计</td>
+ <td class="w130"><%= @closetotal[0] %></td>
+ <td class="w130"><%= @closetotal[2] %></td>
+ <td class="w130"><%= @closetotal[4] %></td>
+ <td class="w130"><%= @closetotal[1] %></td>
+ <td class="w130"><%= @closetotal[3] %></td>
+ <td class="w130"><%= @closetotal[5] %></td>
+ </tr>
<% @results.each do |k,v|%>
<% if v[12] > 0 %>
<tr>
- <td class="hidden dis p10" style="width:166px;"><%= v[:name] %></td>
+ <td class="hidden dis p10" style="width:166px;"><%= v[:name] == "Anonymous" ? "未指派" : v[:name] %></td>
<td class="w130"><%= v[12] %></td>
<td class="w130"><%= v[14] %></td>
<td class="w130"><%= v[16] %></td>
@@ -24,14 +33,5 @@
</tr>
<% end %>
<% end %>
- <tr>
- <td class="hidden dis p10" style="width:166px;">Total</td>
- <td class="w130"><%= @closetotal[0] %></td>
- <td class="w130"><%= @closetotal[2] %></td>
- <td class="w130"><%= @closetotal[4] %></td>
- <td class="w130"><%= @closetotal[1] %></td>
- <td class="w130"><%= @closetotal[3] %></td>
- <td class="w130"><%= @closetotal[5] %></td>
- </tr>
</tbody>
</table>
\ No newline at end of file
diff --git a/app/views/issues/_statistics_open.html.erb b/app/views/issues/_statistics_open.html.erb
index d5eb843f7..e5d07a138 100644
--- a/app/views/issues/_statistics_open.html.erb
+++ b/app/views/issues/_statistics_open.html.erb
@@ -11,10 +11,19 @@
</tr>
</thead>
<tbody>
+ <tr>
+ <td class="hidden dis p10" style="width:166px;">合计</td>
+ <td class="w130"><%= @opentotal[0] %></td>
+ <td class="w130"><%= @opentotal[2] %></td>
+ <td class="w130"><%= @opentotal[4] %></td>
+ <td class="w130"><%= @opentotal[1] %></td>
+ <td class="w130"><%= @opentotal[3] %></td>
+ <td class="w130"><%= @opentotal[5] %></td>
+ </tr>
<% @results.each do |k,v|%>
<% if v[6] > 0 %>
<tr>
- <td class="hidden dis p10" style="width:166px;"><%= v[:name] %></td>
+ <td class="hidden dis p10" style="width:166px;"><%= v[:name] =="Anonymous" ? "未指派" : v[:name] %></td>
<td class="w130"><%= v[6] %></td>
<td class="w130"><%= v[8] %></td>
<td class="w130"><%= v[10] %></td>
@@ -24,14 +33,5 @@
</tr>
<% end %>
<% end %>
- <tr>
- <td class="hidden dis p10" style="width:166px;">Total</td>
- <td class="w130"><%= @opentotal[0] %></td>
- <td class="w130"><%= @opentotal[2] %></td>
- <td class="w130"><%= @opentotal[4] %></td>
- <td class="w130"><%= @opentotal[1] %></td>
- <td class="w130"><%= @opentotal[3] %></td>
- <td class="w130"><%= @opentotal[5] %></td>
- </tr>
</tbody>
</table>
\ No newline at end of file
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 07be357dc..7846efa18 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -148,7 +148,7 @@
<li>
<a href="<%=user_fanslist_user_path(@user) %>">
<strong>粉丝</strong><br />
- <span class="sy_cgrey"><%= @user.watcher_users.count %></span>
+ <span id="user_fans_number" class="sy_cgrey"><%= @user.watcher_users.count %></span>
</a>
</li>
</ul>
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 2a4b3b480..fd7425aab 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -214,7 +214,8 @@
<li>确认密码 : </li>
</ul>
<ul class="setting_right ">
- <li><input id="password" name="password" class="w210" type="password" required="true" nh_required="1"></li>
+ <input style="display:none;">
+ <li><input id="password" name="password" autocomplete="off" class="w210" type="password" required="true" nh_required="1"></li>
<li><input id="new_password" name="new_password" class="w210" type="password" required="true" nh_required="1"><span class="c_red ml5">请输入8-12个字符</span></li>
<li><input id="new_password_confirmation" name="new_password_confirmation" class="w210" type="password" required="true" nh_required="1"></li>
<li class="ml2">
diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb
index 1fb4f7b7a..7322a0615 100644
--- a/app/views/projects/settings/_new_repositories.html.erb
+++ b/app/views/projects/settings/_new_repositories.html.erb
@@ -18,7 +18,7 @@
<span style="display: none" class="c_orange ml100" id="valid_repository_name">版本库名是无效的</span>
</li>
<li class="clear">
- <label class=" fl"> </label>
+ <!-- <label class=" fl"> </label>-->
<p class=" fl c_grey pro_new_grey">1.长度必须在1到254个字符之间<br/>
2.仅限使用小写字母（a-z）、数字、破折号（-）和下划线（_）<br>
3.一旦保存，标识无法修改</p>
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 09ed2216a..74a4878b8 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -1,11 +1,11 @@
<!--新版项目头部结束-->
-<div class="ke-block pro_new_info mb10 break_word" style="padding-bottom: 5px" >
+<div class="ke-block pro_new_info mb10 " style="padding-bottom: 5px;word-break: normal;word-wrap: break-word" >
<div id="project_invite_code"><%= render :partial => 'projects/invite_code' %></div>
<div id="project_description_code" style="padding: 0 15px 10px 15px;">
<% if @project.description.blank? %>
- <p class="break_word" style="padding-top:5px"><%= @project.name %></p>
+ <p style="padding-top:5px"><%= @project.name %></p>
<% else %>
- <p class="break_word" style="padding-top:5px"><%=h @project.description.html_safe %></p>
+ <p style="padding-top:5px"><%=h @project.description.html_safe %></p>
<% end %>
</div>
</div>
diff --git a/app/views/pull_requests/_form.html.erb b/app/views/pull_requests/_form.html.erb
index 43b3bf4d9..d76c3e8a8 100644
--- a/app/views/pull_requests/_form.html.erb
+++ b/app/views/pull_requests/_form.html.erb
@@ -12,9 +12,9 @@
<% if @forked_project.nil? %>
<%= select_tag :branch, options_for_select(@source_rev), :id => "pull_request_branch", :name => "target_branch", :value => "target_branch",:class => "fl PullReques_minselect ml5" %>
<% else %>
- <select onchange="choice_branch(this.value, document.getElementById('pull_request_branch'), <%= @source_rev %>, <%= @forked_rev %>);" id="target_project_id" name="target_project_id" value="target_project_id" class="fl PullReques_minselect">
- <option id="source_project_name" name="<%= @project.id %>" value="<%= @project.id %>" ><%= @source_project_name %></option>
- <option id="target_project_name" name="<%= @forked_project.id %>" value="<%= @forked_project.id %>" ><%= @forked_project_name %></option>
+ <select onchange="choice_branch(this.value, document.getElementById('pull_request_branch'), <%= @source_rev %>, <%= @forked_rev %>, <%= @project.id %>, <%= @project.forked_from_project_id %>);" id="target_project_id" name="target_project_id" value="target_project_id" class="fl PullReques_minselect">
+ <option id="source_project_name" name="source_project_name" value="<%= @project.id %>" ><%= @source_project_name %></option>
+ <option id="target_project_name" name="forked_project_name" value="<%= @forked_project.id %>" ><%= @forked_project_name %></option>
</select>
<select name="target_branch" id="pull_request_branch" class = "fl PullReques_minselect ml5" >
<% @source_rev.each do |rev| %>
diff --git a/app/views/pull_requests/index.html.erb b/app/views/pull_requests/index.html.erb
index 2e10d6598..f2591b6ea 100644
--- a/app/views/pull_requests/index.html.erb
+++ b/app/views/pull_requests/index.html.erb
@@ -3,9 +3,18 @@
<div class="new_roadmap_conbox mb10" >
<div class="new_roadmap_navbox clear">
<ul class="new_roadmap_nav fl" >
- <li class="new_roadmap_nav_hover"><%= link_to "待处理<span class='new_roadmap_nav_taghover ml5'>#{@requests_opened_count}</span>".html_safe, project_pull_requests_path(:type => "1"), :remote => true, :class => "new_roadmap_type_nomal" %></li>
- <li><%= link_to "已处理<span class='new_roadmap_nav_tagnomal ml5'>#{@requests_merged_count}</span>".html_safe, project_pull_requests_path(:type => "2"), :remote => true, :class => "new_roadmap_type_nomal" %></li>
- <li><%= link_to "已关闭<span class='new_roadmap_nav_tagnomal ml5'>#{@requests_closed_count}</span>".html_safe, project_pull_requests_path(:type => "3"), :remote => true, :class => "new_roadmap_type_nomal" %></li>
+ <li class="new_roadmap_nav_hover" id="new_roadmap_nav_1" onclick="HoverLi(1);">
+ <%= link_to "待处理<span class='new_roadmap_nav_taghover ml5' id='new_roadmap_num_1'>#{@requests_opened_count}</span>".html_safe,
+ project_pull_requests_path(:type => "1"), :remote => true, :class => "new_roadmap_type_nomal", :id => "new_roadmap_type_1", :id => "new_roadmap_type_1" %>
+ </li>
+ <li id="new_roadmap_nav_2" onclick="HoverLi(2);">
+ <%= link_to "已处理<span class='new_roadmap_nav_tagnomal ml5' id='new_roadmap_num_2'>#{@requests_merged_count}</span>".html_safe,
+ project_pull_requests_path(:type => "2"), :remote => true, :class => "new_roadmap_type_nomal", :id => "new_roadmap_type_1", :id => "new_roadmap_type_2" %>
+ </li>
+ <li id="new_roadmap_nav_3" onclick="HoverLi(3);">
+ <%= link_to "已关闭<span class='new_roadmap_nav_tagnomal ml5' id='new_roadmap_num_3'>#{@requests_closed_count}</span>".html_safe,
+ project_pull_requests_path(:type => "3"), :remote => true, :class => "new_roadmap_type_nomal", :id => "new_roadmap_type_1", :id => "new_roadmap_type_3" %>
+ </li>
</ul>
<% if allow_pull_request(@project) && User.current.member_of?(@project) %>
<%= link_to "创建Pull Request", new_project_pull_request_path, :class => "btn btn-green fr mr15 mt10" %>
@@ -34,11 +43,23 @@
<script>
// $("#mergeBanner").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
// $("#mergeBanner").parent().before("<div class='homepageRightBanner mb10'><span class='f16 fontGrey3'>Pull Request</span></div>");
+ function g(o){
+ return document.getElementById(o);
+ }
+ function HoverLi(n){
+//如果有N个标签,就将i<=N;
+ for(var i=1;i<=3;i++){
+ g('new_roadmap_nav_'+i).className='new_roadmap_nav_nomal';
+ g('new_roadmap_type_'+i).className='new_roadmap_type_nomal';
+ g('new_roadmap_num_'+i).className='new_roadmap_nav_tagnomal';
+ g('pull_requests_list').className='undis';
+ }
+ g('new_roadmap_nav_'+n).className='new_roadmap_nav_hover';
+ g('new_roadmap_type_'+n).className='new_roadmap_type_hover';
+ g('new_roadmap_num_'+n).className='new_roadmap_nav_taghover';
+ g('pull_requests_list').className='dis';
+ }
- $(".new_roadmap_nav li").click(function(){
- $(".new_roadmap_nav li").removeClass("new_roadmap_nav_hover");
- $(this).addClass("new_roadmap_nav_hover");
- });
</script>
<% else %>
<%= render :partial => "projects/no_data" %>
diff --git a/app/views/users/_user_at_message.html.erb b/app/views/users/_user_at_message.html.erb
index 7bcbe8aa8..024934471 100644
--- a/app/views/users/_user_at_message.html.erb
+++ b/app/views/users/_user_at_message.html.erb
@@ -2,7 +2,9 @@
<ul class="homepageNewsList fl">
<li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.author), :width => "30", :height => "30"),user_path(ma.author) %></a></li>
<li class="homepageNewsPubType fl">
- <span class="newsBlue homepageNewsPublisher"><%= ma.author.login %></span><span class="homepageNewsType fl">提到了你：</span>
+ <span class="newsBlue homepageNewsPublisher">
+ <%= link_to ma.author.show_name, user_path(ma.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+ </span><span class="homepageNewsType fl">提到了你：</span>
</li>
<li class="homepageNewsContent fl">
<% if ma.at_message_type == "Message" && !ma.at_message.course.nil? %>
diff --git a/app/views/users/_user_fans_item.html.erb b/app/views/users/_user_fans_item.html.erb
index b3fc7905c..36d1b1b73 100644
--- a/app/views/users/_user_fans_item.html.erb
+++ b/app/views/users/_user_fans_item.html.erb
@@ -1,55 +1,55 @@
<% unless list.nil?%>
-<% for item in list %>
- <div class="courses_list line" id="fans_item_<%=item.id%>">
- <div class="courses_list_pic fl">
- <a href="<%= user_path(item) %>">
- <%= image_tag(url_to_avatar(item), :style=>"width:64px;height:64px;",:alt=>"头像") %>
- </a>
- </div>
- <div class="courses_list_info fl ml10">
- <a href="<%= user_path(item) %>" title="<%= item.show_name %>" class="courses_list_title f14 fb c_blue02 fl"><%= item.show_name %></a>
- <div class="cl"></div>
- <div class="courses_list_table ">
- <% if item.user_extensions && !item.user_extensions.brief_introduction.nil? && !item.user_extensions.brief_introduction.empty? %>
- <p class="fans_sign" title="<%= item.user_extensions.brief_introduction %>">个性签名：<%= item.user_extensions.brief_introduction %></p>
+ <% for item in list %>
+ <div class="courses_list line" id="fans_item_<%=item.id%>">
+ <div class="courses_list_pic fl">
+ <a href="<%= user_path(item) %>">
+ <%= image_tag(url_to_avatar(item), :style=>"width:64px;height:64px;",:alt=>"头像") %>
+ </a>
+ </div>
+ <div class="courses_list_info fl ml10">
+ <a href="<%= user_path(item) %>" title="<%= item.show_name %>" class="courses_list_title f14 fb c_blue02 fl"><%= item.show_name %></a>
+ <div class="cl"></div>
+ <div class="courses_list_table ">
+ <% if item.user_extensions && !item.user_extensions.brief_introduction.nil? && !item.user_extensions.brief_introduction.empty? %>
+ <p class="fans_sign" title="<%= item.user_extensions.brief_introduction %>">个性签名：<%= item.user_extensions.brief_introduction %></p>
+ <% end %>
+ <table><tbody><tr>
+ <td class="td_w60 ">加入时间：</td>
+ <td class="td_w110 "><%= format_date(item.created_on) %></td>
+ <% if (item.user_extensions.identity == 0 || item.user_extensions.identity == 1) && !item.user_extensions.school.nil? %>
+ <td class="td_w60 ">工作单位：</td>
+ <td class="td_w110 ">
+ <li style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="<%= item.user_extensions.school.name %>">
+ <a href="<%= url_for(:controller=>'welcome',:action => 'course', :school_id => item.user_extensions.school.id,:host=>Setting.host_course) %>"><%= item.user_extensions.school.name %></a>
+ </li>
+ </td>
+ <% elsif item.user_extensions.identity == 3 && !item.user_extensions.occupation.nil? && !item.user_extensions.occupation.empty? %>
+ <td class="td_w60 ">工作单位：</td>
+ <td class="td_w110 ">
+ <li style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="<%= item.user_extensions.occupation %>">
+ <%= item.user_extensions.occupation %>
+ </li>
+ </td>
+ <% elsif item.user_extensions.identity == 2 %>
+ <td class="td_w60 ">工作单位：</td>
+ <td class="td_w110 ">
+ <li style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="<%= item.show_name %>">
+ <%= item.show_name %>
+ </li>
+ </td>
+ <% end %>
+ </tr></tbody></table>
+ </div>
+ </div>
+ <!-- 如果只有自己的关注页面才能关注人 取消关注操作，那么还要加 一句&& User.current.id == target.id-->
+ <% if(User.current.logged? && User.current != item )%>
+ <%if(item.watched_by?(User.current))%>
+ <a href="<%= watch_path(:object_type=>'user',:object_id=>item.id,:target_id=>target.id,:action_name=>action_name,:page=>page) %>" class="grey_n_btn fr mt20" data-method="delete" data-remote="true" title="取消关注">取消关注</a>
+ <% else %>
+ <a href="<%= watch_path(:object_type=>'user',:object_id=>item.id,:target_id=>target.id,:action_name=>action_name,:page=>page) %>" class="blue_n_btn fr mt20" data-method="post" data-remote="true" title="添加关注">添加关注</a>
+ <% end %>
<% end %>
- <table><tbody><tr>
- <td class="td_w60 ">加入时间：</td>
- <td class="td_w110 "><%= format_date(item.created_on) %></td>
- <% if (item.user_extensions.identity == 0 || item.user_extensions.identity == 1) && !item.user_extensions.school.nil? %>
- <td class="td_w60 ">工作单位：</td>
- <td class="td_w110 ">
- <li style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="<%= item.user_extensions.school.name %>">
- <a href="<%= url_for(:controller=>'welcome',:action => 'course', :school_id => item.user_extensions.school.id,:host=>Setting.host_course) %>"><%= item.user_extensions.school.name %></a>
- </li>
- </td>
- <% elsif item.user_extensions.identity == 3 && !item.user_extensions.occupation.nil? && !item.user_extensions.occupation.empty? %>
- <td class="td_w60 ">工作单位：</td>
- <td class="td_w110 ">
- <li style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="<%= item.user_extensions.occupation %>">
- <%= item.user_extensions.occupation %>
- </li>
- </td>
- <% elsif item.user_extensions.identity == 2 %>
- <td class="td_w60 ">工作单位：</td>
- <td class="td_w110 ">
- <li style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="<%= item.show_name %>">
- <%= item.show_name %>
- </li>
- </td>
- <% end %>
- </tr></tbody></table>
+ <div class="cl"></div>
</div>
- </div>
- <!-- 如果只有自己的关注页面才能关注人 取消关注操作，那么还要加 一句&& User.current.id == target.id-->
- <% if(User.current.logged? && User.current != item )%>
- <%if(item.watched_by?(User.current))%>
- <a href="<%= watch_path(:object_type=>'user',:object_id=>item.id,:target_id=>target.id,:action_name=>action_name,:page=>page) %>" class="grey_n_btn fr mt20" data-method="delete" data-remote="true" title="取消关注">取消关注</a>
- <% else %>
- <a href="<%= watch_path(:object_type=>'user',:object_id=>item.id,:target_id=>target.id,:action_name=>action_name,:page=>page) %>" class="blue_n_btn fr mt20" data-method="post" data-remote="true" title="添加关注">添加关注</a>
- <% end %>
- <% end %>
- <div class="cl"></div>
- </div>
-<% end %>
+ <% end %>
<% end %>
\ No newline at end of file
diff --git a/app/views/users/_user_message_applied_schools.html.erb b/app/views/users/_user_message_applied_schools.html.erb
index 9de70a03a..1e2ff86ba 100644
--- a/app/views/users/_user_message_applied_schools.html.erb
+++ b/app/views/users/_user_message_applied_schools.html.erb
@@ -2,6 +2,6 @@
<% if ma.status != 0 %>
<span class="newsBlue homepageNewsPublisher">系统提示</span>
<% else %>
- <%=link_to User.where("id=?", ma.applied_user_id).first.show_name, user_path(ma.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+ <%=link_to User.where("id=?", ma.applied_user_id).first.show_name, user_path(ma.applied_user_id), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
<% end %>
<span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>"><%= applied_school_tip(ma) %></span>
\ No newline at end of file
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 40f25d429..159da2789 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -1,8 +1,15 @@
<% if ma.class == CourseMessage %>
<% if ma.course_message_type == "News" && ma.course_message %>
<ul class="homepageNewsList fl">
- <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"),user_path(ma.course_message.author), :target => '_blank' %></a></li>
- <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了通知：</span></li>
+ <li class="homepageNewsPortrait fl">
+ <a href="javascript:void(0);">
+ <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"),user_path(ma.course_message.author), :target => '_blank' %>
+ </a>
+ </li>
+ <li class="homepageNewsPubType fl">
+ <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+ <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了通知：</span>
+ </li>
<li class="homepageNewsContent fl">
<%= link_to ma.course_message.title, {:controller => 'news', :action => 'show', :id => ma.course_message.id },
:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
@@ -22,7 +29,7 @@
<% if ma.course_message_type == "Comment" && ma.course_message %>
<ul class="homepageNewsList fl">
<li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author), :target => '_blank' %></a></li>
- <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评论了通知：</span></li>
+ <li class="homepageNewsPubType fl"><%=link_to User.find(ma.course_message.author_id).show_name, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评论了通知：</span></li>
<li class="homepageNewsContent fl">
<%= link_to ma.course_message.commented.title, {:controller => 'news', :action => 'show', :id => ma.course_message.commented.id },
:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" , :target => '_blank'%>
@@ -291,7 +298,7 @@
<ul class="homepageNewsList fl">
<li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author), :target => '_blank' %></a></li>
<li class="homepageNewsPubType fl">
- <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
+ <%=link_to ma.course_message.author.show_name, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
<%= ma.course_message.parent_id.nil? ? "发布了班级帖子：" : "评论了班级帖子：" %></span></li>
<% if ma.course_message.parent_id.nil? %>
<li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
@@ -615,7 +622,7 @@
<a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.course_message_id)), :width => "30", :height => "30"), user_path(ma.course_message_id), :target => '_blank' %></a>
</li>
<li class="homepageNewsPubType fl">
- <%=link_to User.find(ma.course_message_id), user_path(User.find(ma.course_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+ <%=link_to User.find(ma.course_message_id).show_name, user_path(User.find(ma.course_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
<span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">将您加入了班级：</span>
</li>
<li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
@@ -683,7 +690,7 @@
<a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.course_message_id)), :width => "30", :height => "30"), user_path(ma.course_message_id), :target => '_blank' %></a>
</li>
<li class="homepageNewsPubType fl">
- <%=link_to User.find(ma.course_message_id), user_path(User.find(ma.course_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+ <%=link_to User.find(ma.course_message_id).show_name, user_path(User.find(ma.course_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
<span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">将您移出了班级：</span>
</li>
<li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
diff --git a/app/views/users/_user_message_forge.html.erb b/app/views/users/_user_message_forge.html.erb
index 479710002..5a1cecfb6 100644
--- a/app/views/users/_user_message_forge.html.erb
+++ b/app/views/users/_user_message_forge.html.erb
@@ -26,7 +26,7 @@
<a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.forge_message_id)), :width => "30", :height => "30"), user_path(ma.forge_message_id), :target => '_blank' %></a>
</li>
<li class="homepageNewsPubType fl">
- <%=link_to User.find(ma.forge_message_id), user_path(User.find(ma.forge_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+ <%=link_to User.find(ma.forge_message_id).show_name, user_path(User.find(ma.forge_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
<span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">将您加入了项目：</span>
</li>
<li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
@@ -47,7 +47,7 @@
<a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.forge_message_id)), :width => "30", :height => "30"), user_path(ma.forge_message_id), :target => '_blank' %></a>
</li>
<li class="homepageNewsPubType fl">
- <%=link_to User.find(ma.forge_message_id), user_path(User.find(ma.forge_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+ <%=link_to User.find(ma.forge_message_id).show_name, user_path(User.find(ma.forge_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
<span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">将您移出了项目：</span>
</li>
<li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
@@ -99,11 +99,15 @@
<a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %></a>
</li>
<li class="homepageNewsPubType fl">
- <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
- <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>"><%= ma.forge_message.tracker_id == 5 ? "发布的周报：":"指派给你的问题："%></span>
+ <%=link_to User.find(ma.forge_message.author_id).show_name, user_path(ma.forge_message.author),
+ :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+ <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
+ <%= ma.forge_message.tracker_id == 5 ? "发布的周报：":"指派给你的问题："%>
+ </span>
</li>
<li class="homepageHomeworkContent fl"><a href="javascript:void(0);" class="newsGrey">
- <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+ <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id),
+ :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
<!--:onmouseover => "message_titile_show($(this),event)",-->
<!--:onmouseout => "message_titile_hide($(this))" %>-->
</a>
@@ -117,8 +121,11 @@
<a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %></a>
</li>
<li class="homepageNewsPubType fl">
- <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
- <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>"><%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%></span>
+ <%=link_to User.find(ma.forge_message.author_id).show_name, user_path(ma.forge_message.author),
+ :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+ <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
+ <%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%>
+ </span>
</li>
<li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
<%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
@@ -133,10 +140,12 @@
<% if ma.forge_message_type == "Journal" && ma.forge_message %>
<ul class="homepageNewsList fl">
<li class="homepageNewsPortrait fl">
- <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user), :target => '_blank' %></a>
+ <a href="javascript:void(0);">
+ <%=link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user), :target => '_blank' %>
+ </a>
</li>
<li class="homepageNewsPubType fl">
- <%=link_to ma.forge_message.user, user_path(ma.forge_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+ <%= link_to User.find(ma.forge_message.user_id).show_name, user_path(ma.forge_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
<span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
更新了问题状态：</span>
</li>
@@ -153,7 +162,7 @@
<% if ma.forge_message_type == "Message" %>
<ul class="homepageNewsList fl">
<li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %></a></li>
- <li class="homepageNewsPubType fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+ <li class="homepageNewsPubType fl"><%=link_to User.find(ma.forge_message.user_id).show_name, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
<span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %></span></li>
<li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
<%= link_to ma.forge_message.subject, board_message_path(ma.forge_message.board_id, ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
@@ -166,9 +175,16 @@
<% end %>
<% if ma.forge_message_type == "Comment" %>
<ul class="homepageNewsList fl">
- <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %></a></li>
- <li class="homepageNewsPubType fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
- <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评论了新闻：</span></li>
+ <li class="homepageNewsPortrait fl">
+ <a href="javascript:void(0);">
+ <%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %>
+ </a>
+ </li>
+ <li class="homepageNewsPubType fl">
+ <%=link_to User.find(ma.forge_message.user_id).show_name, user_path(ma.forge_message.author),
+ :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+ <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评论了新闻：</span>
+ </li>
<li class="homepageNewsContent fl">
<%= link_to "#{ma.forge_message.commented.title}",
{:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
diff --git a/app/views/users/_user_message_forum.html.erb b/app/views/users/_user_message_forum.html.erb
index 5d6c5bcad..37ad1a744 100644
--- a/app/views/users/_user_message_forum.html.erb
+++ b/app/views/users/_user_message_forum.html.erb
@@ -5,7 +5,7 @@
<a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.memo.author), :width => "30", :height => "30"), user_path(ma.memo.author), :target => '_blank' %></a>
</li>
<li class="homepageNewsPubType fl">
- <%=link_to ma.memo.author, user_path(ma.memo.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+ <%=link_to User.find(ma.memo.author_id).show_name, user_path(ma.memo.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
<span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>" ><%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %></span>
</li>
<% if ma.memo.parent_id.nil? %>
diff --git a/app/views/users/_user_message_userfeedaback.html.erb b/app/views/users/_user_message_userfeedaback.html.erb
index 666fa37a3..00fa78eeb 100644
--- a/app/views/users/_user_message_userfeedaback.html.erb
+++ b/app/views/users/_user_message_userfeedaback.html.erb
@@ -2,11 +2,16 @@
<% if ma.journals_for_message_type == "JournalsForMessage" %>
<ul class="homepageNewsList fl">
<li class="homepageNewsPortrait fl">
- <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.journals_for_message.user), :width => "30", :height => "30"), user_path(ma.journals_for_message.user), :target => '_blank' %></a>
+ <a href="javascript:void(0);">
+ <%=link_to image_tag(url_to_avatar(ma.journals_for_message.user), :width => "30", :height => "30"),
+ user_path(ma.journals_for_message.user), :target => '_blank' %>
+ </a>
</li>
<li class="homepageNewsPubType fl">
- <%=link_to ma.journals_for_message.user, user_path(ma.journals_for_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
- <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %></span>
+ <%=link_to User.find(ma.journals_for_message.user_id).show_name, user_path(ma.journals_for_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+ <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
+ <%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %>
+ </span>
</li>
<li class="homepageNewsContent fl">
<%= link_to message_content(ma.journals_for_message.notes), feedback_path(ma.journals_for_message.jour_id, :anchor => "user_activity_#{ma.journals_for_message.id}"), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank'%>
diff --git a/app/views/users/user_fanslist.html.erb b/app/views/users/user_fanslist.html.erb
index 47bdc9126..041dabd03 100644
--- a/app/views/users/user_fanslist.html.erb
+++ b/app/views/users/user_fanslist.html.erb
@@ -7,39 +7,39 @@
}
</script>
- <div class="courses_box" id="RSide" style="margin-left:0; margin-bottom:0; width:728px;">
- <div class="courses_top mb10" id="<%= (@action == 'fans' || @action == 'visitor' ) ? 'nh_fans_list' : 'nh_wacth_list' %>">
- <% if @action == 'fans' %>
+<div class="courses_box" id="RSide" style="margin-left:0; margin-bottom:0; width:728px;">
+ <div class="courses_top mb10" id="<%= (@action == 'fans' || @action == 'visitor' ) ? 'nh_fans_list' : 'nh_wacth_list' %>">
+ <% if @action == 'fans' %>
<h2 class="courses_h2 fl">粉丝</h2>
<div class="courses_select fr">共有<span class="c_orange" nh_name="fans_count" id="fans_span"><%=@obj_count%></span>名粉丝</div>
- <% elsif @action == 'visitor' %>
+ <% elsif @action == 'visitor' %>
<h2 class="courses_h2 fl">访客</h2>
<div class="courses_select fr">共有<span class="c_orange"><%=@obj_count%></span>访客</div>
- <% else %>
+ <% else %>
<h2 class="courses_h2 fl">关注</h2>
<div class="courses_select fr">一共关注<span class="c_orange" nh_name="watcher_count" id="watch_span"><%=@obj_count%></span>人</div>
- <% end %>
+ <% end %>
+ <div class="cl"></div>
+ </div>
+ <div id="users_list">
+ <%# for item in @list %>
+ <%= render :partial => 'users/user_fans_item', :locals => {:list => @list,:target=>@user,:action_name=>@action,:page=>params[:page]} %>
+ <%# end %>
+ </div>
+ <p id="nodata" class="nodata" style="display:<%= @list.count > 0 ? 'none' : 'block' %>;"><%= l(:label_no_data) %></p>
+
+ <div style="text-align:center;">
+ <div class="pages" style="width:auto; display:inline-block;">
+ <ul id="homework_pository_ref_pages">
+ <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true, :is_new => true%>
+ </ul>
<div class="cl"></div>
</div>
- <div id="users_list">
- <%# for item in @list %>
- <%= render :partial => 'users/user_fans_item', :locals => {:list => @list,:target=>@user,:action_name=>@action,:page=>params[:page]} %>
- <%# end %>
- </div>
- <p id="nodata" class="nodata" style="display:<%= @list.count > 0 ? 'none' : 'block' %>;"><%= l(:label_no_data) %></p>
-
- <div style="text-align:center;">
- <div class="pages" style="width:auto; display:inline-block;">
- <ul id="homework_pository_ref_pages">
- <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true, :is_new => true%>
- </ul>
- <div class="cl"></div>
- </div>
- </div>
-
- <!--<ul class="wlist" style=" border:none;">-->
- <!--<%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>-->
- <!--</ul>-->
- <!--<div class="cl"></div>-->
</div>
+
+ <!--<ul class="wlist" style=" border:none;">-->
+ <!--<%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>-->
+ <!--</ul>-->
+ <!--<div class="cl"></div>-->
+</div>
<!--</div>-->
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 2baa9f2f2..b1ae0aff2 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -87,3 +87,4 @@
+
diff --git a/app/views/watchers/_set_watcher.js.erb b/app/views/watchers/_set_watcher.js.erb
index fee58c15c..83358b049 100644
--- a/app/views/watchers/_set_watcher.js.erb
+++ b/app/views/watchers/_set_watcher.js.erb
@@ -1,7 +1,9 @@
<% if( params[:object_type] == 'user') %>
//点击头像下面的添加关注按钮
<% if( params[:target_id] == params[:object_id] ) %>
- $("#watch_user_btn_div").html("<%= escape_javascript render(:partial => "layouts/user_watch_btn", :locals => {:target => watched.first}) %>");
+ <% if @user %>
+ $("#watch_user_btn_div").html("<%= escape_javascript render(:partial => "layouts/user_watch_btn", :locals => {:target => watched.first}) %>");
+ <% end %>
$("#user_fans_number").html("<%= watched.first.watcher_users.count.to_s%>");
$(".add_cancel_watch_<%= watched.first.id %>").html("<%= escape_javascript (render :partial => 'users/watch_btn_for_picture', :locals => {:user => watched.first}) %>");
$(".fans_count_<%= watched.first.id %>").text("<%= watched.first.watcher_users.count.to_s %>");
diff --git a/db/migrate/20161121063025_delete_temp_error_message.rb b/db/migrate/20161121063025_delete_temp_error_message.rb
new file mode 100644
index 000000000..7e5063be5
--- /dev/null
+++ b/db/migrate/20161121063025_delete_temp_error_message.rb
@@ -0,0 +1,12 @@
+class DeleteTempErrorMessage < ActiveRecord::Migration
+ def up
+ Organization.where(:id => 68).update_all(:name => "blankname")
+ MessageAll.where(:message_id => 171).destroy_all
+ OrgMessage.where(:id => 171).destroy_all
+ MessageAll.where(:message_id => 16).destroy_all
+ OrgMessage.where(:id => 16).destroy_all
+ end
+
+ def down
+ end
+end
diff --git a/db/migrate/20161121091826_modify_fixed_version_id.rb b/db/migrate/20161121091826_modify_fixed_version_id.rb
new file mode 100644
index 000000000..3456aec28
--- /dev/null
+++ b/db/migrate/20161121091826_modify_fixed_version_id.rb
@@ -0,0 +1,8 @@
+class ModifyFixedVersionId < ActiveRecord::Migration
+ def up
+ Issue.where(:fixed_version_id => 0).update_all(:fixed_version_id => nil)
+ end
+
+ def down
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 2739d5dcd..5e5833771 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -996,6 +996,19 @@ ActiveRecord::Schema.define(:version => 20161117060138) do
t.datetime "updated_at", :null => false
end
+ create_table "ii", :force => true do |t|
+ t.integer "project_id"
+ t.string "author_login"
+ t.string "rep_identifier"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ t.integer "sonar_version", :default => 0
+ t.string "path"
+ t.string "branch"
+ t.string "language"
+ t.string "sonar_name"
+ end
+
create_table "innodb_monitor", :id => false, :force => true do |t|
t.integer "a"
end
@@ -1587,6 +1600,7 @@ ActiveRecord::Schema.define(:version => 20161117060138) do
t.boolean "hidden_repo", :default => false, :null => false
t.integer "attachmenttype", :default => 1
t.integer "user_id"
+ t.integer "dts_test", :default => 0
t.string "enterprise_name"
t.integer "organization_id"
t.integer "project_new_type"
@@ -1594,11 +1608,6 @@ ActiveRecord::Schema.define(:version => 20161117060138) do
t.integer "forked_from_project_id"
t.integer "forked_count"
t.integer "publish_resource", :default => 0
- t.integer "boards_count", :default => 0
- t.integer "news_count", :default => 0
- t.integer "acts_count", :default => 0
- t.integer "journals_count", :default => 0
- t.integer "boards_reply_count", :default => 0
t.integer "visits", :default => 0
t.integer "hot", :default => 0
t.string "invite_code"
@@ -1625,19 +1634,6 @@ ActiveRecord::Schema.define(:version => 20161117060138) do
t.datetime "updated_at", :null => false
end
- create_table "quality_analyses", :force => true do |t|
- t.integer "project_id"
- t.string "author_login"
- t.string "rep_identifier"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
- t.integer "sonar_version", :default => 0
- t.string "path"
- t.string "branch"
- t.string "language"
- t.string "sonar_name"
- end
-
create_table "queries", :force => true do |t|
t.integer "project_id"
t.string "name", :default => "", :null => false
diff --git a/lib/gitlab-cli/lib/gitlab/request.rb b/lib/gitlab-cli/lib/gitlab/request.rb
index 64a8f6b4c..683c11776 100644
--- a/lib/gitlab-cli/lib/gitlab/request.rb
+++ b/lib/gitlab-cli/lib/gitlab/request.rb
@@ -19,6 +19,8 @@ module Gitlab
ObjectifiedHash.new body
elsif body.is_a? Array
body.collect! { |e| ObjectifiedHash.new(e) }
+ elsif body == true
+ body
else
raise Error::Parsing.new "Couldn't parse a response body"
end
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 3f5a739f9..ac8dfcc44 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1706,7 +1706,14 @@ function autoUrl(id){
}
return reStr ;
});
- $(this).html(html);
+ try{
+ $(this).html(html);
+ }
+ catch (e)
+ {
+ console.log(e.name + ": " + e.message);
+ }
+
}
});
}
@@ -1725,7 +1732,13 @@ function autoUrl(id){
}
return reStr ;
});
- $("#"+id).html(html);
+ try{
+ $("#"+id).html(html);
+ }
+ catch (e)
+ {
+ console.log(e.name + ": " + e.message);
+ }
}
if(!(!!window.ActiveXObject || "ActiveXObject" in window)){
autoMedia(id);
diff --git a/public/javascripts/project.js b/public/javascripts/project.js
index be3327985..10dfbd9bb 100644
--- a/public/javascripts/project.js
+++ b/public/javascripts/project.js
@@ -665,18 +665,30 @@ function search_tag_attachment(url,tag_name,q,course_id,sort)
}
-function choice_branch(name, branch, source_rev, forked_rev) {
- switch (name) {
- case "source_project_name" :
- var branchOptions = source_rev;
- break;
- case "forked_project_name" :
- var branchOptions = forked_rev;
- break;
- default:
- var branchOptions = source_rev;
- break;
+function choice_branch(name, branch, source_rev, forked_rev, project_id, project_forked_from_id) {
+ if (name==project_id){
+ var branchOptions = source_rev;
}
+ else if (name == project_forked_from_id){
+ var branchOptions = forked_rev;
+ }
+ else{
+ var branchOptions = source_rev;
+ }
+
+// switch (name) {
+// case project_id :
+// alert("project_id" + project_id);
+// var branchOptions = source_rev;
+// break;
+// case project_forked_from_id :
+// alert("project_forked_from_id"+project_forked_from_id);
+// var branchOptions = forked_rev;
+// break;
+// default:
+// var branchOptions = source_rev;
+// break;
+// }
branch.options.length = 0;
for (var i = 0; i < branchOptions.length; i++) {
diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css
index 296a009f1..ab7ae4d62 100644
--- a/public/stylesheets/css/common.css
+++ b/public/stylesheets/css/common.css
@@ -301,6 +301,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/
.w720{width:721px;}
.w730{width:730px;}
.w770{ width:770px;}
+.h15{ height: 15px; }
.h28{height: 28px;}
.h20{height: 20px;}
.h22{ height:22px;}