jro_apps/redmine Commit - r881:b0bb1baeaac6

Trac importer: user can now choose between sqlite and sqlite3 adapter for Trac database....

Jean-Philippe Lang -

r881:b0bb1baeaac6

parent child

Context file:

r881:b0bb1baeaac6

Collapse all files

app/views/issues/index.rhtml +2 -1

                 <h2><%=l(:label_issue_plural)%></h2>
                 <% set_html_title l(:label_issue_plural) %>
-                <% form_tag({ :controller => 'queries', :action => 'new', :project_id => @project }, :id => 'query_form') do %>
+                <% form_tag({ :controller => 'queries', :action => 'new' }, :id => 'query_form') do %>
+                <%= hidden_field_tag('project_id', @project.id) if @project %>
                 <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
                 <div class="contextual">
                 <%= link_to_remote l(:button_apply),

lib/tasks/migrate_from_trac.rake +12 -2

                   end
                   def self.migrate
+                    establish_connection({:adapter => trac_adapter,
+                                          :database => trac_db_path})
                     # Quick database test before clearing Redmine data
                     TracComponent.count
                     @trac_directory
                   end
+                  def self.set_trac_adapter(adapter)
+                    return false unless %w(sqlite sqlite3).include?(adapter)
+                    @trac_adapter = adapter
+                  end
+                  def self.trac_adapter; @trac_adapter end
                   def self.trac_db_path; "#{trac_directory}/db/trac.db" end
                   def self.trac_attachments_directory; "#{trac_directory}/attachments" end
                                             :description => identifier.humanize
                       project.identifier = identifier
                       puts "Unable to create a project with identifier '#{identifier}'!" unless project.save
+                      # enable issues and wiki for the created project
+                      project.enabled_module_names = ['issue_tracking', 'wiki']
                     end
                     @target_project = project.new_record? ? nil : project
                   end
                 end
                 prompt('Trac directory') {|directory| TracMigrate.set_trac_directory directory}
+                prompt('Trac database adapter (sqlite, sqlite3)', :default => 'sqlite') {|adapter| TracMigrate.set_trac_adapter adapter}
                 prompt('Trac database encoding', :default => 'UTF-8') {|encoding| TracMigrate.encoding encoding}
                 prompt('Target project identifier') {|identifier| TracMigrate.target_project_identifier identifier}
                 puts
-                TracMigrate.establish_connection({:adapter => 'sqlite',
-                                                  :database => "#{TracMigrate.trac_db_path}"})
                 TracMigrate.migrate
               end
             end

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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