jro_apps/redmine Commit - r2562:2679cc2045a7

Merged r2574, r2578, r2589, r2615, r2641, r2645, r2646 from trunk....

Jean-Philippe Lang -

r2562:2679cc2045a7

parent child

Context file:

r2562:2679cc2045a7

app/models/journal.rb +1 -1

                                                           :conditions => "#{Journal.table_name}.journalized_type = 'Issue' AND" +
                                                                          " (#{JournalDetail.table_name}.prop_key = 'status_id' OR #{Journal.table_name}.notes <> '')"}
-              def save
+              def save(*args)
                 # Do not save an empty journal
                 (details.empty? && notes.blank?) ? false : super
               end

app/models/news.rb +1 -1

               validates_length_of :title, :maximum => 60
               validates_length_of :summary, :maximum => 255
-              acts_as_searchable :columns => ['title', "#{table_name}.description"], :include => :project
+              acts_as_searchable :columns => ['title', 'summary', "#{table_name}.description"], :include => :project
               acts_as_event :url => Proc.new {|o| {:controller => 'news', :action => 'show', :id => o.id}}
               acts_as_activity_provider :find_options => {:include => [:project, :author]},
                                         :author_key => :author_id

app/models/project.rb +1 -1

               validates_associated :repository, :wiki
               validates_length_of :name, :maximum => 30
               validates_length_of :homepage, :maximum => 255
-              validates_length_of :identifier, :in => 2..20
+              validates_length_of :identifier, :in => 1..20
               validates_format_of :identifier, :with => /^[a-z0-9\-]*$/
               before_destroy :delete_all_members

app/views/issues/_sidebar.rhtml +2 -2

             <%= call_hook(:view_issues_sidebar_issues_bottom) %>
             <% planning_links = []
-              planning_links << link_to(l(:label_calendar), :action => 'calendar', :project_id => @project) if User.current.allowed_to?(:view_calendar, @project, :global => true)
+              planning_links << link_to(l(:label_calendar), :controller => 'issues', :action => 'calendar', :project_id => @project) if User.current.allowed_to?(:view_calendar, @project, :global => true)
-              planning_links << link_to(l(:label_gantt), :action => 'gantt', :project_id => @project) if User.current.allowed_to?(:view_gantt, @project, :global => true)
+              planning_links << link_to(l(:label_gantt), :controller => 'issues', :action => 'gantt', :project_id => @project) if User.current.allowed_to?(:view_gantt, @project, :global => true)
             %>
             <% unless planning_links.empty? %>
             <h3><%= l(:label_planning) %></h3>

app/views/mailer/layout.text.plain.rhtml +1 -1

             <%= yield %>
-            ----------------------------------------
+            --
             <%= Setting.emails_footer %>

app/views/projects/_form.rhtml +1 -1

             <p><%= f.text_area :description, :rows => 5, :class => 'wiki-edit' %></p>
             <p><%= f.text_field :identifier, :required => true, :disabled => @project.identifier_frozen? %>
             <% unless @project.identifier_frozen? %>
-            <br /><em><%= l(:text_length_between, 2, 20) %> <%= l(:text_project_identifier_info) %></em>
+            <br /><em><%= l(:text_length_between, 1, 20) %> <%= l(:text_project_identifier_info) %></em>
             <% end %></p>
             <p><%= f.text_field :homepage, :size => 60 %></p>
             <p><%= f.check_box :is_public %></p>

app/views/wiki/show.rhtml +2 0

             <%= link_to_attachments @page %>
             <% if @editable && authorize_for('wiki', 'add_attachment') %>
+            <div id="wiki_add_attachment">
             <p><%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",
                                                          :id => 'attach_files_link' %></p>
             <% form_tag({ :controller => 'wiki', :action => 'add_attachment', :page => @page.title }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
             <%= submit_tag l(:button_add) %>
             <%= link_to l(:button_cancel), {}, :onclick => "Element.hide('add_attachment_form'); Element.show('attach_files_link'); return false;" %>
             <% end %>
+            </div>
             <% end %>
             <p class="other-formats">

doc/CHANGELOG +6 0

             * Ability to set language for redmine:load_default_data task using REDMINE_LANG environment variable
             * Rescue Redmine::DefaultData::DataAlreadyLoaded in redmine:load_default_data task
             * CSS classes to highlight own and assigned issues
+            * Hide "New file" link on wiki pages from printing
             * Flush buffer when asking for language in redmine:load_default_data task
+            * Minimum project identifier length set to 1
             * Fixed: Time entries csv export links for all projects are malformed
             * Fixed: Files without Version aren't visible in the Activity page
+            * Fixed: Commit logs are centered in the repo browser
+            * Fixed: News summary field content is not searchable
+            * Fixed: Journal#save has a wrong signature
+            * Fixed: Email footer signature convention
             == 2009-03-07 v0.8.2

public/stylesheets/application.css +4 -3

             tr.changeset td.author { text-align: center; width: 15%; }
             tr.changeset td.committed_on { text-align: center; width: 15%; }
-            tr.file td { text-align: center; }
+            table.files tr.file td { text-align: center; }
-            tr.file td.filename { text-align: left; padding-left: 24px; }
+            table.files tr.file td.filename { text-align: left; padding-left: 24px; }
-            tr.file td.digest { font-size: 80%; }
+            table.files tr.file td.digest { font-size: 80%; }
             tr.message { height: 2.6em; }
             tr.message td.last_message { font-size: 80%; }
               #top-menu, #header, #main-menu, #sidebar, #footer, .contextual, .other-formats { display:none; }
               #main { background: #fff; }
               #content { width: 99%; margin: 0; padding: 0; border: 0; background: #fff; overflow: visible !important;}
+            	#wiki_add_attachment { display:none; }
             }

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages