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

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
linhk 2014-09-16 11:42:06 +08:00
parent 56c31d6e2f ed81275d17
commit 185bbf3cf7
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/attachments_controller.rb
View File

@ -361,7 +361,7 @@ private
def login_without_softapplication def login_without_softapplication
referer = request.headers['Referer'] referer = request.headers['Referer']
require_login unless referer =~ /softapplication/ require_login unless referer =~ /softapplication/ || referer =~ /memos/
end end
def renderTag def renderTag

1
app/controllers/contest_notification_controller.rb
View File

@ -1,4 +1,5 @@
class ContestNotificationController < ApplicationController class ContestNotificationController < ApplicationController
layout 'contest_base'
def show def show
@notification = ContestNotification.find(params[:id]) @notification = ContestNotification.find(params[:id])
end end

5
app/controllers/journals_controller.rb
View File

@ -54,6 +54,11 @@ class JournalsController < ApplicationController
end end
(render_404; return false) unless @issue && @detail (render_404; return false) unless @issue && @detail
@diff = Redmine::Helpers::Diff.new(@detail.value, @detail.old_value) @diff = Redmine::Helpers::Diff.new(@detail.value, @detail.old_value)
respond_to do |format|
format.html {
render :layout => 'project_base'
}
end
end end
def new def new

4
app/helpers/projects_helper.rb
View File

@ -181,7 +181,7 @@ module ProjectsHelper
# unless project.is_public == 1 # unless project.is_public == 1
if project.is_public != 1 if project.is_public != 1
s = "<span class='private_project'>#{l(:lable_private)}</span>".html_safe s = "<span class='private_project'>#{l(:label_private)}</span>".html_safe
else else
s = "".html_safe s = "".html_safe
end end
@ -197,7 +197,7 @@ module ProjectsHelper
if !project.is_public if !project.is_public
# end longjun # end longjun
s = "<span class='private_project'>#{l(:lable_private)}</span>".html_safe s = "<span class='private_project'>#{l(:label_private)}</span>".html_safe
else else
s = "".html_safe s = "".html_safe
end end

3
app/views/memos/show.html.erb
View File

@ -23,7 +23,8 @@
)if !@memo.locked? && User.current.logged? %> )if !@memo.locked? && User.current.logged? %>
<%= link_to( <%= link_to(
image_tag('edit.png'), #image_tag('edit.png'),
l(:button_edit),
{:action => 'edit', :id => @memo}, {:action => 'edit', :id => @memo},
:method => 'get', :method => 'get',
:title => l(:button_edit) :title => l(:button_edit)