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

app/controllers/stores_controller.rb

@@ -5,12 +5,18 @@ class StoresController < ApplicationController
   layout 'base_stores'
 
   def search
+    begin
     q = "%#{params[:name].strip}%"
     (redirect_to stores_path, :notice => l(:label_sumbit_empty);return) if params[:name].blank?
 
     result = find_public_attache q
     @searched_attach = paginateHelper result
     @result_all_count = result.count;
+    rescue Exception => e
+      #render 'stores'
+      redirect_to stores_path
+  end
+
   end
 
   def find_public_attache keywords

app/helpers/application_helper.rb

@@ -685,7 +685,7 @@ module ApplicationHelper
     when 2
       obj = args.shift
       attr = args.shift
-      text = obj.send(attr).to_s
+      text = obj.send(attr).html_safe.to_s
     else
       raise ArgumentError, 'invalid arguments to textilizable'
     end
@@ -716,6 +716,48 @@ module ApplicationHelper
     text.html_safe
   end
 
+  #
+  #格式化字符串，不转义html代码
+  def textAreailizable(*args)
+    options = args.last.is_a?(Hash) ? args.pop : {}
+    case args.size
+      when 1
+        obj = options[:object]
+        text = args.shift
+      when 2
+        obj = args.shift
+        attr = args.shift
+        text = obj.send(attr).html_safe.to_s
+      else
+        raise ArgumentError, 'invalid arguments to textilizable'
+    end
+    return '' if text.blank?
+    project = options[:project] || @project || (obj && obj.respond_to?(:project) ? obj.project : nil)
+    only_path = options.delete(:only_path) == false ? false : true
+
+    text = text.dup
+    macros = catch_macros(text)
+    text = Redmine::WikiFormatting.to_html("CKEditor", text, :object => obj, :attribute => attr)
+
+    @parsed_headings = []
+    @heading_anchors = {}
+    @current_section = 0 if options[:edit_section_links]
+
+    parse_sections(text, project, obj, attr, only_path, options)
+    text = parse_non_pre_blocks(text, obj, macros) do |text|
+      [:parse_inline_attachments, :parse_wiki_links, :parse_redmine_links].each do |method_name|
+        send method_name, text, project, obj, attr, only_path, options
+      end
+    end
+    parse_headings(text, project, obj, attr, only_path, options)
+
+    if @parsed_headings.any?
+      replace_toc(text, @parsed_headings)
+    end
+
+    text.html_safe
+  end
+
   def parse_non_pre_blocks(text, obj, macros)
     s = StringScanner.new(text)
     tags = []

app/helpers/issues_helper.rb

@@ -73,7 +73,7 @@ module IssuesHelper
     ancestors.each do |ancestor|
       s << '<div>' + content_tag('p', link_to_issue(ancestor, :project => (issue.project_id != ancestor.project_id)))
     end
-    s << '<div>'
+    s << '<div style="word-wrap: break-word; word-break: normal;">'
     subject = h(issue.subject)
     if issue.is_private?
       subject = content_tag('span', l(:field_is_private), :class => 'private') + ' ' + subject

app/helpers/wiki_helper.rb

@@ -40,4 +40,14 @@ module WikiHelper
       link_to(h(parent.pretty_title), {:controller => 'wiki', :action => 'show', :id => parent.title, :project_id => parent.project, :version => nil})
     })
   end
+
+  def wiki_content_format wiki
+    text = wiki.text.html_safe
+    text = parse_non_pre_blocks(text, wiki, text) do |text|
+      [:parse_inline_attachments, :parse_wiki_links, :parse_redmine_links].each do |method_name|
+        send method_name, text, project, wiki, attr, only_path, options
+      end
+    end
+    text
+  end
 end

app/models/issue.rb

@@ -138,10 +138,10 @@ class Issue < ActiveRecord::Base
           nil
         when 'default'
           user_ids = [user.id] + user.groups.map(&:id)
-          "(#{table_name}.is_private = #{connection.quoted_false} OR #{table_name}.author_id = #{user.id} OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))"
+          "(#{table_name}.is_private = #{connection.quoted_false}) OR (#{table_name}.author_id = #{user.id} OR #{table_name}.tracker_id IN (#{user_ids.join(',')}) OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))"
         when 'own'
           user_ids = [user.id] + user.groups.map(&:id)
-          "(#{table_name}.author_id = #{user.id} OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))"
+          "(#{table_name}.author_id = #{user.id} OR #{table_name}.tracker_id IN (#{user_ids.join(',')}) OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))"
         else
           '1=0'
         end
@@ -159,9 +159,9 @@ class Issue < ActiveRecord::Base
         when 'all'
           true
         when 'default'
-          !self.is_private? || (self.author == user || user.is_or_belongs_to?(assigned_to))
+          (!self.is_private? ||self.tracker == user) || (self.author == user || user.is_or_belongs_to?(assigned_to))
           when 'own'
-          self.author == user || user.is_or_belongs_to?(assigned_to)
+            self.tracker == user || self.author == user || user.is_or_belongs_to?(assigned_to)
         else
           false
         end
@@ -1009,9 +1009,10 @@ class Issue < ActiveRecord::Base
     s << ' overdue' if overdue?
     s << ' child' if child?
     s << ' parent' unless leaf?
-    s << ' private' if is_private?
+    #s << ' private' if is_private?
     s << ' created-by-me' if User.current.logged? && author_id == User.current.id
     s << ' assigned-to-me' if User.current.logged? && assigned_to_id == User.current.id
+    s << ' tracker-id'  if User.current.logged? && tracker_id == User.current.id
     s
   end
 

app/views/documents/show.html.erb

@@ -9,7 +9,7 @@
 <% end %>
 </div>
 
-<h2><%=h @document.title %></h2>
+<h2 style="word-wrap: break-word; word-break: normal;"><%=h @document.title %></h2>
 
 <p><em><%#=h @document.category.name %><br />
 <%= format_date @document.created_on %></em></p>

app/views/messages/_project_show.html.erb

@@ -161,8 +161,8 @@
 
               <td class="comments">
                 <div class="wiki">
-                  <%#= textilizable message,:content,:attachments => message.attachments %>
+                  <%= textAreailizable message,:content,:attachments => message.attachments %>
-                  <%= message.content.html_safe  %>
+                  <%#= message.content.html_safe  %>
                 </div>
                 <%= link_to_attachments message, :author => false %> </td>
             </tr>

app/views/wiki/_content.html.erb

@@ -1,5 +1,5 @@
 <div class="wiki wiki-page">
-  <%= textilizable content, :text, :attachments => content.page.attachments,
+  <%= textAreailizable content, :text, :attachments => content.page.attachments,
         :edit_section_links => (@sections_editable && {:controller => 'wiki', :action => 'edit', :project_id => @page.project, :id => @page.title}) %>
   <%#= content.text.html_safe  %>
 </div>

app/views/wiki/edit.html.erb

@@ -16,7 +16,7 @@
     <div class="actions" style="max-width:680px">
       <p style="max-width:680px;"><%=text_area_tag 'content[text]', @text, :required => true, :id => 'editor02', :cols => 100, :rows => 25 %></p>
       <script type="text/javascript">
-          var ckeditor=CKEDITOR.replace('editor02');
+          var ckeditor=CKEDITOR.replace('editor02',{height: '300'});
       </script>
     </div>