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

app/controllers/application_controller.rb

@@ -256,13 +256,16 @@ class ApplicationController < ActionController::Base
   end
 
   def authorize_attachment_download(ctrl = params[:controller], action = params[:action], global = false)
-    if @attachment.container_type == "Memo"
+    case @attachment.container_type
+      when "Memo"
         allowed = User.current.allowed_to?(:memos_attachments_download,nil,:global => true)
-    elsif  @attachment.container_type == "Message" && !@project.nil?
+      when "Message"
+        if @project
           allowed = User.current.allowed_to?(:projects_attachments_download,@project,:global => false)
-    elsif @attachment.container_type == "Message" && !@course.nil?
+        elsif @course
           allowed = User.current.allowed_to?(:course_attachments_download, @course, :global => false)
-    elsif @attachment.container_type == "contest"
+        end
+      when "contest"
         return true
       else
         return true

app/models/attachment.rb

@@ -402,13 +402,8 @@ class Attachment < ActiveRecord::Base
 
   # Finds an attachment that matches the given token and that has no container
   def self.find_by_token(token)
-    if token.to_s =~ /^(\d+)\.([0-9a-f]+)$/
+    attachment = find_by_token_only(token)
-      attachment_id, attachment_digest = $1, $2
+    attachment if attachment.container.nil?
-      attachment = Attachment.where(:id => attachment_id, :digest => attachment_digest).first
-      if attachment && attachment.container.nil?
-        attachment
-      end
-    end
   end
 
   # Finds an attachment that matches the given token
@@ -416,9 +411,6 @@ class Attachment < ActiveRecord::Base
     if token.to_s =~ /^(\d+)\.([0-9a-f]+)$/
       attachment_id, attachment_digest = $1, $2
       attachment = Attachment.where(:id => attachment_id, :digest => attachment_digest).first
-      if attachment
-        attachment
-      end
     end
   end
 

app/views/courses/new.html.erb

@@ -11,3 +11,4 @@
     <%= javascript_tag "$('#course_name').focus();" %>
     </div>
 <% end %>
+<% html_title(l(:label_course_new)) -%>

app/views/layouts/_base_footer.html.erb

@@ -10,8 +10,8 @@
     <%= @organize.description.html_safe unless @organize.nil?%>
   </p>
   <div id="logo_link">
-    <% unless @companys.nil?%>
+    <% unless @companies.nil?%>
-        <% @companys.each do |company| %>
+        <% @companies.each do |company| %>
             <span class="footer_logo_link"><%= link_to image_tag(url_to_avatar(company),:size=>"100x30",:alt=>company.name),company.url, :target => "_blank" %></span>
         <% end %>
     <% end %>

app/views/school/index.html.erb

@@ -98,4 +98,4 @@
 
 	</ul>
 </div>
-
+<% html_title(l(:label_school_all)) -%>

app/views/stores/index.html.erb

@@ -69,3 +69,4 @@
         }
 	});
 </script>
+<% html_title(l(:label_stores_index)) -%>