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

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 

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

app/views/layouts/base_newcontest.html.erb

@@ -179,9 +179,9 @@
 										<div class="user_underline"></div>
 										<div class="font_title_left">
 											<strong><%= l(:label_x_followers, :count => @contest.watcher_users.count) %></strong>
-											<!-- <% 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>
-											<% end %> -->
+											 <% if show_more_fans?(@contest) %>
+											   <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 %>
 										</div>
 										<div class="left_wf">
 											<table>

app/views/memos/edit.html.erb

@@ -26,8 +26,11 @@
     </p>
     <p><%= f.text_area :content, :required => true, :size => 80, id: 'editor01' %></p>
     <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/>
     <%= f.submit :value => l(:button_change) %>&nbsp;&nbsp;<%= link_to l(:button_back), back_url ,:class => "button-canel",:style => "color: #ffffff;"%>
   </div>
 <% end %>
-</div>

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