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:
sw 2014-10-08 17:31:59 +08:00
parent 978c883f6e 9217351b1c
commit caabbd44cb
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/contests_controller.rb
View File

@ -258,7 +258,7 @@ class ContestsController < ApplicationController
contests.each do |contest| contests.each do |contest|
contest.projects.each do |project| contest.projects.each do |project|
@uers += project.users @users += project.users
end end
end end
# end # end

1
app/controllers/memos_controller.rb
View File

@ -148,6 +148,7 @@ class MemosController < ApplicationController
@memo.update_column(:sticky, params[:memo][:sticky]) && @memo.update_column(:sticky, params[:memo][:sticky]) &&
@memo.update_column(:lock, params[:memo][:lock])) @memo.update_column(:lock, params[:memo][:lock]))
@memo.save_attachments(params[:attachments] || (params[:memo] && params[:memo][:uploads])) @memo.save_attachments(params[:attachments] || (params[:memo] && params[:memo][:uploads]))
@memo.save
# @memo.root.update_attribute(:updated_at, @memo.updated_at) # @memo.root.update_attribute(:updated_at, @memo.updated_at)
format.html {redirect_to back_memo_url, notice: "#{l :label_memo_create_succ}"} format.html {redirect_to back_memo_url, notice: "#{l :label_memo_create_succ}"}
else else

6
app/views/layouts/base_newcontest.html.erb
View File

@ -179,9 +179,9 @@
<div class="user_underline"></div> <div class="user_underline"></div>
<div class="font_title_left"> <div class="font_title_left">
<strong><%= l(:label_x_followers, :count => @contest.watcher_users.count) %></strong> <strong><%= l(:label_x_followers, :count => @contest.watcher_users.count) %></strong>
<!-- <% if show_more_fans?(@contest) %> <% if show_more_fans?(@contest) %>
<span style="display:inline-block; font-size: 12px; float:right; margin-bottom: -4px;"><%= link_to l(:label_more), :controller => 'contests', :action => 'show_contest_user'%></span> <span style="display:inline-block; font-size: 12px; float:right; margin-bottom: -4px;"><%= link_to l(:label_more), show_contest_user_contest_path(@contest) %></span>
<% end %> --> <% end %>
</div> </div>
<div class="left_wf"> <div class="left_wf">
<table> <table>

5
app/views/memos/edit.html.erb
View File

@ -26,8 +26,11 @@
</p> </p>
<p><%= f.text_area :content, :required => true, :size => 80, id: 'editor01' %></p> <p><%= f.text_area :content, :required => true, :size => 80, id: 'editor01' %></p>
<script type="text/javascript">var ckeditor=CKEDITOR.replace('editor01');</script> <script type="text/javascript">var ckeditor=CKEDITOR.replace('editor01');</script>
<p>
<%= l(:label_attachment_plural) %><br />
<%= render :partial => 'attachments/form', :locals => {:container => @memo} %>
</p>
<br/> <br/>
<%= f.submit :value => l(:button_change) %>&nbsp;&nbsp;<%= link_to l(:button_back), back_url ,:class => "button-canel",:style => "color: #ffffff;"%> <%= f.submit :value => l(:button_change) %>&nbsp;&nbsp;<%= link_to l(:button_back), back_url ,:class => "button-canel",:style => "color: #ffffff;"%>
</div> </div>
<% end %> <% end %>
</div>

1
config/routes.rb
View File

@ -132,6 +132,7 @@ RedmineApp::Application.routes.draw do
match 'add_softapplication' , :via => [:get, :post] match 'add_softapplication' , :via => [:get, :post]
match 'create' , :via => :post match 'create' , :via => :post
match 'settings' , :via => [:get, :post] match 'settings' , :via => [:get, :post]
match 'show_contest_user'
end end
end end