jro_apps/redmine Commit - r134:4ee55dc45690

updated validation format of repository url to allow file:///...

Jean-Philippe Lang -

r134:4ee55dc45690

parent child

Context file:

r134:4ee55dc45690

Collapse all files

app/models/repository.rb +1 -1

             # 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.
             class Repository < ActiveRecord::Base
               belongs_to :project
               validates_presence_of :url
-              validates_format_of :url, :with => /^(http|https|svn):\/\/.+/i
+              validates_format_of :url, :with => /^(http|https|svn|file):\/\/.+/i
               @scm = nil
               def scm
                 @scm ||= SvnRepos::Base.new url
               end
             end

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

             <%= error_messages_for 'project' %>
             <div class="box">
             <!--[form:project]-->
             <p><%= f.text_field :name, :required => true %></p>
             <% if admin_loggedin? and !@root_projects.empty? %>
                 <p><%= f.select :parent_id, (@root_projects.collect {|p| [p.name, p.id]}), { :include_blank => true } %></p>
             <% end %>
             <p><%= f.text_area :description, :required => true, :cols => 60, :rows => 3 %></p>
             <p><%= f.text_field :homepage, :size => 40 %></p>
             <p><%= f.check_box :is_public %></p>
             <% for @custom_value in @custom_values %>
             	<p><%= custom_field_tag_with_label @custom_value %></p>
             <% end %>
             <% unless @custom_fields.empty? %>
             <p><label><%=l(:label_custom_field_plural)%></label>
             <% for custom_field in @custom_fields %>
             	<%= check_box_tag "custom_field_ids[]", custom_field.id, ((@project.custom_fields.include? custom_field) or custom_field.is_for_all?), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>
             	<%= custom_field.name %>
             <% end %></p>
             <% end %>
             <!--[eoform:project]-->
             </div>
             <div class="box"><h3><%= check_box_tag "repository_enabled", 1, !@project.repository.nil?, :onclick => "Element.toggle('repository');" %> <%= l(:label_repository) %></h3>
             <%= hidden_field_tag "repository_enabled", 0 %>
             <div id="repository">
             <% fields_for :repository, @project.repository, { :builder => TabularFormBuilder, :lang => current_language} do |repository| %>
-            <p><%= repository.text_field :url, :size => 60, :required => true %><br />(http://, https://, svn://)</p>
+            <p><%= repository.text_field :url, :size => 60, :required => true %><br />(http://, https://, svn://, file:///)</p>
             <% end %>
             </div>
             <%= javascript_tag "Element.hide('repository');" if @project.repository.nil? %>
             </div>

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