diff --git a/app/controllers/contests_controller.rb b/app/controllers/contests_controller.rb index 1b7791ac4..71edfe835 100644 --- a/app/controllers/contests_controller.rb +++ b/app/controllers/contests_controller.rb @@ -258,7 +258,7 @@ class ContestsController < ApplicationController contests.each do |contest| contest.projects.each do |project| - @uers += project.users + @users += project.users end end # end diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb index 9f261c78a..b980331df 100644 --- a/app/controllers/memos_controller.rb +++ b/app/controllers/memos_controller.rb @@ -148,6 +148,7 @@ class MemosController < ApplicationController @memo.update_column(:sticky, params[:memo][:sticky]) && @memo.update_column(:lock, params[:memo][:lock])) @memo.save_attachments(params[:attachments] || (params[:memo] && params[:memo][:uploads])) + @memo.save # @memo.root.update_attribute(:updated_at, @memo.updated_at) format.html {redirect_to back_memo_url, notice: "#{l :label_memo_create_succ}"} else diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb index c8e78d7f5..adce80d24 100644 --- a/app/views/layouts/base_newcontest.html.erb +++ b/app/views/layouts/base_newcontest.html.erb @@ -179,9 +179,9 @@
<%= l(:label_x_followers, :count => @contest.watcher_users.count) %> - + <% if show_more_fans?(@contest) %> + <%= link_to l(:label_more), show_contest_user_contest_path(@contest) %> + <% end %>
diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb index 04d95ae86..ded3a1b12 100644 --- a/app/views/memos/edit.html.erb +++ b/app/views/memos/edit.html.erb @@ -26,8 +26,11 @@

<%= f.text_area :content, :required => true, :size => 80, id: 'editor01' %>

+

+ <%= l(:label_attachment_plural) %>
+ <%= render :partial => 'attachments/form', :locals => {:container => @memo} %> +


<%= f.submit :value => l(:button_change) %>  <%= link_to l(:button_back), back_url ,:class => "button-canel",:style => "color: #ffffff;"%> <% end %> - diff --git a/config/routes.rb b/config/routes.rb index c4584ea7b..f4f858a9f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -132,6 +132,7 @@ RedmineApp::Application.routes.draw do match 'add_softapplication' , :via => [:get, :post] match 'create' , :via => :post match 'settings' , :via => [:get, :post] + match 'show_contest_user' end end