jro_apps/redmine Commit - r880:1454a711caf6

Diff style (inline or side by side) automatically saved as a user preference....

Jean-Philippe Lang -

r880:1454a711caf6

parent child

Context file:

r880:1454a711caf6

Collapse all files

app/controllers/repositories_controller.rb +8 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'SVG/Graph/Bar'
             require 'SVG/Graph/BarHorizontal'
             require 'digest/sha1'
             class RepositoriesController < ApplicationController
               layout 'base'
               before_filter :find_repository, :except => :edit
               before_filter :find_project, :only => :edit
               before_filter :authorize
               accept_key_auth :revisions
               def edit
                 @repository = @project.repository
                 if !@repository
                   @repository = Repository.factory(params[:repository_scm])
                   @repository.project = @project
                 end
                 if request.post?
                   @repository.attributes = params[:repository]
                   @repository.save
                 end
                 render(:update) {|page| page.replace_html "tab-content-repository", :partial => 'projects/settings/repository'}
               end
               def destroy
                 @repository.destroy
                 redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'repository'
               end
               def show
                 # check if new revisions have been committed in the repository
                 @repository.fetch_changesets if Setting.autofetch_changesets?
                 # get entries for the browse frame
                 @entries = @repository.entries('')
                 # latest changesets
                 @changesets = @repository.changesets.find(:all, :limit => 10, :order => "committed_on DESC")
                 show_error and return unless @entries || @changesets.any?
               end
               def browse
                 @entries = @repository.entries(@path, @rev)
                 if request.xhr?
                   @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
                 else
                   show_error unless @entries
                 end
               end
               def changes
                 @entry = @repository.scm.entry(@path, @rev)
                 show_error and return unless @entry
                 @changesets = @repository.changesets_for_path(@path)
               end
               def revisions
                 @changeset_count = @repository.changesets.count
                 @changeset_pages = Paginator.new self, @changeset_count,
 ,
             								      params['page']
                 @changesets = @repository.changesets.find(:all,
             						:limit  =>  @changeset_pages.items_per_page,
             						:offset =>  @changeset_pages.current.offset)
                 respond_to do |format|
                   format.html { render :layout => false if request.xhr? }
                   format.atom { render_feed(@changesets, :title => "#{@project.name}: #{l(:label_revision_plural)}") }
                 end
               end
               def entry
                 @content = @repository.scm.cat(@path, @rev)
                 show_error and return unless @content
                 if 'raw' == params[:format]
                   send_data @content, :filename => @path.split('/').last
                 end
               end
               def revision
                 @changeset = @repository.changesets.find_by_revision(@rev)
                 show_error and return unless @changeset
                 @changes_count = @changeset.changes.size
                 @changes_pages = Paginator.new self, @changes_count, 150, params['page']
                 @changes = @changeset.changes.find(:all,
               						:limit  =>  @changes_pages.items_per_page,
               						:offset =>  @changes_pages.current.offset)
               	render :action => "revision", :layout => false if request.xhr?
               end
               def diff
                 @rev_to = params[:rev_to] ? params[:rev_to].to_i : (@rev - 1)
-                @diff_type = ('sbs' == params[:type]) ? 'sbs' : 'inline'
+                @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline'
+                @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type)
+                # Save diff type as user preference
+                if User.current.logged? && @diff_type != User.current.pref[:diff_type]
+                  User.current.pref[:diff_type] = @diff_type
+                  User.current.preference.save
+                end
                 @cache_key = "repositories/diff/#{@repository.id}/" + Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}")
                 unless read_fragment(@cache_key)
                   @diff = @repository.diff(@path, @rev, @rev_to, @diff_type)
                   show_error and return unless @diff
                 end
               end
               def stats
               end
               def graph
                 data = nil
                 case params[:graph]
                 when "commits_per_month"
                   data = graph_commits_per_month(@repository)
                 when "commits_per_author"
                   data = graph_commits_per_author(@repository)
                 end
                 if data
                   headers["Content-Type"] = "image/svg+xml"
                   send_data(data, :type => "image/svg+xml", :disposition => "inline")
                 else
                   render_404
                 end
               end
             private
               def find_project
                 @project = Project.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_repository
                 @project = Project.find(params[:id])
                 @repository = @project.repository
                 render_404 and return false unless @repository
                 @path = params[:path].join('/') unless params[:path].nil?
                 @path ||= ''
                 @rev = params[:rev].to_i if params[:rev]
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def show_error
                 flash.now[:error] = l(:notice_scm_error)
                 render :nothing => true, :layout => true
               end
               def graph_commits_per_month(repository)
                 @date_to = Date.today
                 @date_from = @date_to << 11
                 @date_from = Date.civil(@date_from.year, @date_from.month, 1)
                 commits_by_day = repository.changesets.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
                 commits_by_month = [0] * 12
                 commits_by_day.each {|c| commits_by_month[c.first.to_date.months_ago] += c.last }
                 changes_by_day = repository.changes.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
                 changes_by_month = [0] * 12
                 changes_by_day.each {|c| changes_by_month[c.first.to_date.months_ago] += c.last }
                 fields = []
                 month_names = l(:actionview_datehelper_select_month_names_abbr).split(',')
 .times {|m| fields << month_names[((Date.today.month - 1 - m) % 12)]}
                 graph = SVG::Graph::Bar.new(
                   :height => 300,
                   :width => 500,
                   :fields => fields.reverse,
                   :stack => :side,
                   :scale_integers => true,
                   :step_x_labels => 2,
                   :show_data_values => false,
                   :graph_title => l(:label_commits_per_month),
                   :show_graph_title => true
                 )
                 graph.add_data(
                   :data => commits_by_month[0..11].reverse,
                   :title => l(:label_revision_plural)
                 )
                 graph.add_data(
                   :data => changes_by_month[0..11].reverse,
                   :title => l(:label_change_plural)
                 )
                 graph.burn
               end
               def graph_commits_per_author(repository)
                 commits_by_author = repository.changesets.count(:all, :group => :committer)
                 commits_by_author.sort! {|x, y| x.last <=> y.last}
                 changes_by_author = repository.changes.count(:all, :group => :committer)
                 h = changes_by_author.inject({}) {|o, i| o[i.first] = i.last; o}
                 fields = commits_by_author.collect {|r| r.first}
                 commits_data = commits_by_author.collect {|r| r.last}
                 changes_data = commits_by_author.collect {|r| h[r.first] || 0}
                 fields = fields + [""]*(10 - fields.length) if fields.length<10
                 commits_data = commits_data + [0]*(10 - commits_data.length) if commits_data.length<10
                 changes_data = changes_data + [0]*(10 - changes_data.length) if changes_data.length<10
                 graph = SVG::Graph::BarHorizontal.new(
                   :height => 300,
                   :width => 500,
                   :fields => fields,
                   :stack => :side,
                   :scale_integers => true,
                   :show_data_values => false,
                   :rotate_y_labels => false,
                   :graph_title => l(:label_commits_per_author),
                   :show_graph_title => true
                 )
                 graph.add_data(
                   :data => commits_data,
                   :title => l(:label_revision_plural)
                 )
                 graph.add_data(
                   :data => changes_data,
                   :title => l(:label_change_plural)
                 )
                 graph.burn
               end
             end
             class Date
               def months_ago(date = Date.today)
                 (date.year - self.year)*12 + (date.month - self.month)
               end
               def weeks_ago(date = Date.today)
                 (date.year - self.year)*52 + (date.cweek - self.cweek)
               end
             end
             class String
               def with_leading_slash
                 starts_with?('/') ? self : "/#{self}"
               end
             end

app/views/repositories/diff.rhtml +1 -1

             <h2><%= l(:label_revision) %> <%= @rev %>: <%= @path.gsub(/^.*\//, '') %></h2>
             <!-- Choose view type -->
             <% form_tag({ :controller => 'repositories', :action => 'diff'}, :method => 'get') do %>
               <% params.each do |k, p| %>
                 <% if k != "type" %>
                   <%= hidden_field_tag(k,p) %>
                 <% end %>
                 <% end %>
               <p><label><%= l(:label_view_diff) %></label>
-              <%= select_tag 'type', options_for_select([[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], params[:type]), :onchange => "if (this.value != '') {this.form.submit()}" %></p>
+              <%= select_tag 'type', options_for_select([[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], @diff_type), :onchange => "if (this.value != '') {this.form.submit()}" %></p>
             <% end %>
             <div class="autoscroll">
             <% cache(@cache_key) do %>
             <% @diff.each do |table_file| %>
             <% if @diff_type == 'sbs' %>
                 <table class="filecontent CodeRay">
                   <thead>
                     <tr>
                       <th colspan="4" class="filename">
                         <%= table_file.file_name %>
                       </th>
                     </tr>
                     <tr>
                       <th colspan="2">@<%= @rev %></th>
                       <th colspan="2">@<%= @rev_to %></th>
                     </tr>
                   </thead>
                   <tbody>
                     <% table_file.keys.sort.each do |key| %>
                       <tr>
                         <th class="line-num">
                           <%= table_file[key].nb_line_left %>
                         </th>
                         <td class="line-code <%= table_file[key].type_diff_left %>">
                           <pre><%=to_utf8 table_file[key].line_left %></pre>
                         </td>
                         <th class="line-num">
                           <%= table_file[key].nb_line_right %>
                         </th>
                         <td class="line-code <%= table_file[key].type_diff_right %>">
                           <pre><%=to_utf8 table_file[key].line_right %></pre>
                         </td>
                       </tr>
                     <% end %>
                   </tbody>
                 </table>
             <% else %>
                 <table class="filecontent CodeRay">
                   <thead>
                     <tr>
                       <th colspan="3" class="filename">
                         <%= table_file.file_name %>
                       </th>
                     </tr>
                     <tr>
                       <th>@<%= @rev %></th>
                       <th>@<%= @rev_to %></th>
                       <th></th>
                     </tr>
                   </thead>
                   <tbody>
                     <% table_file.keys.sort.each do |key, line| %>
                       <tr>
                         <th class="line-num">
                           <%= table_file[key].nb_line_left %>
                         </th>
                         <th class="line-num">
                           <%= table_file[key].nb_line_right %>
                         </th>
                         <% if table_file[key].line_left.empty? %>
                           <td class="line-code <%= table_file[key].type_diff_right %>">
                             <pre><%=to_utf8 table_file[key].line_right %></pre>
                           </td>
                         <% else %>
                           <td class="line-code <%= table_file[key].type_diff_left %>">
                             <pre><%=to_utf8 table_file[key].line_left %></pre>
                           </td>
                         <% end %>
                       </tr>
                     <% end %>
                   </tbody>
                 </table>
             <% end %>
             <% end %>
             <% end %>
             </div>
             <% content_for :header_tags do %>
             <%= stylesheet_link_tag "scm" %>
             <% end %>

test/unit/user_test.rb +2 -2

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../test_helper'
             class UserTest < Test::Unit::TestCase
               fixtures :users, :members, :projects
               def setup
                 @admin = User.find(1)
                 @jsmith = User.find(2)
                 @dlopper = User.find(3)
               end
               def test_truth
                 assert_kind_of User, @jsmith
               end
               def test_create
                 user = User.new(:firstname => "new", :lastname => "user", :mail => "newuser@somenet.foo")
                 user.login = "jsmith"
                 user.password, user.password_confirmation = "password", "password"
                 # login uniqueness
                 assert !user.save
                 assert_equal 1, user.errors.count
                 user.login = "newuser"
                 user.password, user.password_confirmation = "passwd", "password"
                 # password confirmation
                 assert !user.save
                 assert_equal 1, user.errors.count
                 user.password, user.password_confirmation = "password", "password"
                 assert user.save
               end
               def test_update
                 assert_equal "admin", @admin.login
                 @admin.login = "john"
                 assert @admin.save, @admin.errors.full_messages.join("; ")
                 @admin.reload
                 assert_equal "john", @admin.login
               end
               def test_validate
                 @admin.login = ""
                 assert !@admin.save
                 assert_equal 2, @admin.errors.count
               end
               def test_password
                 user = User.try_to_login("admin", "admin")
                 assert_kind_of User, user
                 assert_equal "admin", user.login
                 user.password = "hello"
                 assert user.save
                 user = User.try_to_login("admin", "hello")
                 assert_kind_of User, user
                 assert_equal "admin", user.login
                 assert_equal User.hash_password("hello"), user.hashed_password
               end
               def test_lock
                 user = User.try_to_login("jsmith", "jsmith")
                 assert_equal @jsmith, user
                 @jsmith.status = User::STATUS_LOCKED
                 assert @jsmith.save
                 user = User.try_to_login("jsmith", "jsmith")
                 assert_equal nil, user
               end
               def test_rss_key
                 assert_nil @jsmith.rss_token
                 key = @jsmith.rss_key
                 assert_equal 40, key.length
                 @jsmith.reload
                 assert_equal key, @jsmith.rss_key
               end
               def test_role_for_project
                 # user with a role
                 role = @jsmith.role_for_project(Project.find(1))
                 assert_kind_of Role, role
                 assert_equal "Manager", role.name
                 # user with no role
                 assert !@dlopper.role_for_project(Project.find(2)).member?
               end
               def test_mail_notification_all
                 @jsmith.mail_notification = true
                 @jsmith.notified_project_ids = []
                 @jsmith.save
                 @jsmith.reload
                 assert @jsmith.projects.first.recipients.include?(@jsmith.mail)
               end
               def test_mail_notification_selected
                 @jsmith.mail_notification = false
-                @jsmith.notified_project_ids = [@jsmith.projects.first.id]
+                @jsmith.notified_project_ids = [1]
                 @jsmith.save
                 @jsmith.reload
-                assert @jsmith.projects.first.recipients.include?(@jsmith.mail)
+                assert Project.find(1).recipients.include?(@jsmith.mail)
               end
               def test_mail_notification_none
                 @jsmith.mail_notification = false
                 @jsmith.notified_project_ids = []
                 @jsmith.save
                 @jsmith.reload
                 assert !@jsmith.projects.first.recipients.include?(@jsmith.mail)
               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