jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Signed-off-by: alan <547533434@qq.com>

This commit is contained in:
alan 2014-10-30 10:06:35 +08:00
parent b7cac9427b
commit 7487c538f3
6 changed files with 1328 additions and 1319 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile.lock
View File

@ -125,6 +125,7 @@ GEM
mocha (1.1.0) mocha (1.1.0)
metaclass (~> 0.0.1) metaclass (~> 0.0.1)
multi_json (1.10.1) multi_json (1.10.1)
mysql2 (0.3.11)
mysql2 (0.3.11-x86-mingw32) mysql2 (0.3.11-x86-mingw32)
net-ldap (0.3.1) net-ldap (0.3.1)
nokogiri (1.6.3) nokogiri (1.6.3)

2
app/views/layouts/base_projects.html.erb
View File

@ -95,7 +95,7 @@
<td align="center" width="70px"> <%= l(:label_member) %></td> <td align="center" width="70px"> <%= l(:label_member) %></td>
<td align="center" width="100px"><%= l(:label_user_watchered) %></td> <td align="center" width="100px"><%= l(:label_user_watchered) %></td>
<td align="center" width="70px"> <%= l(:label_project_issues) %></td> <td align="center" width="70px"> <%= l(:label_project_issues) %></td>
<!-- <td align="center" width="58px"><%= l(:label_attachment) %></td> --> <!-- <td align="center" width="58px"><%#= l(:label_attachment) %></td> -->
</tr> </tr>
</table> </table>
<div class="user_underline"></div> <div class="user_underline"></div>

3
app/views/projects/_tools_expand.html.erb
View File

@ -11,6 +11,9 @@
<% if @project.enabled_modules.where("name = 'wiki'").count > 0 %> <% if @project.enabled_modules.where("name = 'wiki'").count > 0 %>
<li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= link_to l(:project_module_wiki), project_wiki_path(@project) %></li> <li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= link_to l(:project_module_wiki), project_wiki_path(@project) %></li>
<% end %> <% end %>
<% if @project.enabled_modules.where("name = 'code_review'").count > 0 %>
<li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= link_to l(:project_module_code_review), {controller: 'code_review', action: 'index', id: @project.id} %></li>
<% end %>
</ul> </ul>
<ul><h3>进度跟踪</h3> <ul><h3>进度跟踪</h3>
<% if @project.enabled_modules.where("name = 'calendar'").count > 0 %> <% if @project.enabled_modules.where("name = 'calendar'").count > 0 %>

1
config/routes.rb
View File

@ -392,6 +392,7 @@ RedmineApp::Application.routes.draw do
end end
end end
resources :versions, :except => [:index, :show, :edit, :update, :destroy] do resources :versions, :except => [:index, :show, :edit, :update, :destroy] do
collection do collection do
put 'close_completed' put 'close_completed'

28
lib/redmine/menu_manager.rb
View File

@ -170,7 +170,9 @@ module Redmine
end end
def render_single_menu_node(item, caption, url, selected) def render_single_menu_node(item, caption, url, selected)
link_to(h(caption), url, item.html_options(:selected => selected)) unless url.include?('code_review')
link_to(h(caption), url, item.html_options(:selected => selected))
end
end end
def render_unattached_menu_item(menu_item, project) def render_unattached_menu_item(menu_item, project)
@ -198,17 +200,19 @@ module Redmine
end end
def extract_node_details(node, project=nil) def extract_node_details(node, project=nil)
item = node
url = case item.url item = node
when Hash url = case item.url
project.nil? ? item.url : {item.param => project}.merge(item.url) when Hash
when Symbol project.nil? ? item.url : {item.param => project}.merge(item.url)
send(item.url) when Symbol
else send(item.url)
item.url else
end item.url
caption = item.caption(project) end
return [caption, url, (current_menu_item == item.name)] caption = item.caption(project)
return [caption, url, (current_menu_item == item.name)]
end end
# Checks if a user is allowed to access the menu item by: # Checks if a user is allowed to access the menu item by: