jro_apps/redmine Commit - r936:92a23c05bb71

Jicamarca Repository

0

- This repo
- ?
- Use '/' key to quickly access this field. - Enter a name of repository, or repository group for quick search. - Prefix query to allow special search: user:admin, to search for usernames, always global user_group:devops, to search for user groups, always global pr:303, to search for pull request number, title, or description, always global commit:efced4, to search for commits, scoped to repositories or groups file:models.py, to search for file paths, scoped to repositories or groups For advanced full text search visit: repository search
Home
Public journal
Gists
Sign in

jro_apps » redmine

RSS

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

               def add
                 @custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                 @trackers = Tracker.all
-                @root_projects = Project.find(:all, :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}")
+                @root_projects = Project.find(:all,
+                                              :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}",
+                                              :order => 'name')
                 @project = Project.new(params[:project])
                 @project.enabled_module_names = Redmine::AccessControl.available_project_modules
                 if request.get?
               end
               def settings
-                @root_projects = Project::find(:all, :conditions => ["parent_id IS NULL AND status = #{Project::STATUS_ACTIVE} AND id <> ?", @project.id])
+                @root_projects = Project.find(:all,
+                                              :conditions => ["parent_id IS NULL AND status = #{Project::STATUS_ACTIVE} AND id <> ?", @project.id],
+                                              :order => 'name')
                 @custom_fields = IssueCustomField.find(:all)
                 @issue_category ||= IssueCategory.new
                 @member ||= @project.members.new

                   else
                     case column.name
                     when :subject
-                    ((@project.nil? || @project != issue.project) ? "#{issue.project.name} - " : '') +
+                    h((@project.nil? || @project != issue.project) ? "#{issue.project.name} - " : '') +
                       link_to(h(value), :controller => 'issues', :action => 'show', :id => issue)
                     when :done_ratio
                       progress_bar(value, :width => '80px')

               validates_associated :custom_values, :on => :update
               validates_associated :repository, :wiki
               validates_length_of :name, :maximum => 30
-              validates_format_of :name, :with => /^[\w\s\'\-]*$/i
               validates_length_of :description, :maximum => 255
               validates_length_of :homepage, :maximum => 60
-              validates_length_of :identifier, :in => 3..12
+              validates_length_of :identifier, :in => 3..20
               validates_format_of :identifier, :with => /^[a-z0-9\-]*$/
               def identifier=(identifier)

               <tbody>
             <% for project in @projects %>
               <tr class="<%= cycle("odd", "even") %>">
-            	<td><%= project.active? ? link_to(project.name, :controller => 'projects', :action => 'settings', :id => project) : h(project.name) %>
+            	<td><%= project.active? ? link_to(h(project.name), :controller => 'projects', :action => 'settings', :id => project) : h(project.name) %>
             	<td><%= textilizable project.description, :project => project %>
             	<td align="center"><%= image_tag 'true.png' if project.is_public? %>
             	<td align="center"><%= project.children.size %>

             			<td class="id">
             				<%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %>
             			</td>
-            			<td><%= issue.project.name %> - <%= issue.tracker.name %><br />
+            			<td><%=h issue.project.name %> - <%= issue.tracker.name %><br />
                             <%= issue.status.name %> - <%= format_time(issue.updated_on) %></td>
             			<td class="subject">
                             <%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %>

             <option selected><%= l(:label_jump_to_a_project) %></option>
             <option disabled>---</option>
             <% user_projects_by_root.keys.sort.each do |root| %>
-                <%= content_tag('option', root.name, :value => url_for(:controller => 'projects', :action => 'show', :id => root)) %>
+                <%= content_tag('option', h(root.name), :value => url_for(:controller => 'projects', :action => 'show', :id => root)) %>
                 <% user_projects_by_root[root].sort.each do |project| %>
                     <% next if project == root %>
-                    <%= content_tag('option', ('&#187; ' + project.name), :value => url_for(:controller => 'projects', :action => 'show', :id => project)) %>
+                    <%= content_tag('option', ('&#187; ' + h(project.name)), :value => url_for(:controller => 'projects', :action => 'show', :id => project)) %>
                 <% end %>
             <% end %>
             </select>

                                                   :onchange => 'if ($("notification_option").value == "selected") {Element.show("notified-projects")} else {Element.hide("notified-projects")}' %>
             <% content_tag 'div', :id => 'notified-projects', :style => (@notification_option == 'selected' ? '' : 'display:none;') do %>
             <p><% User.current.projects.each do |project| %>
-                <label><%= check_box_tag 'notified_project_ids[]', project.id, @user.notified_projects_ids.include?(project.id) %> <%= project.name %></label><br />
+                <label><%= check_box_tag 'notified_project_ids[]', project.id, @user.notified_projects_ids.include?(project.id) %> <%=h project.name %></label><br />
             <% end %></p>
             <p><em><%= l(:text_user_mail_option) %></em></p>
             <% end %>

             <% end %>
             <p><%= f.text_area :description, :required => true, :cols => 60, :rows => 5 %><em><%= l(:text_caracters_maximum, 255) %></em></p>
-            <p><%= f.text_field :identifier, :required => true, :size => 15, :disabled => @project.identifier_frozen? %><br /><em><%= l(:text_length_between, 3, 12) %> <%= l(:text_project_identifier_info) unless @project.identifier_frozen? %></em></p>
+            <p><%= f.text_field :identifier, :required => true, :disabled => @project.identifier_frozen? %><br /><em><%= l(:text_length_between, 3, 20) %> <%= l(:text_project_identifier_info) unless @project.identifier_frozen? %></em></p>
             <p><%= f.text_field :homepage, :size => 40 %></p>
             <p><%= f.check_box :is_public %></p>
             <%= wikitoolbar_for 'project_description' %>

             <h2><%=l(:label_confirmation)%></h2>
             <div class="box">
             <center>
-            <p><strong><%= @project_to_destroy.name %></strong><br />
+            <p><strong><%=h @project_to_destroy.name %></strong><br />
             <%=l(:text_project_destroy_confirmation)%></p>
             <p>

             @events.each do |i| %>
                 <div style="position: absolute;line-height:1.2em;height:16px;top:<%= top %>px;left:4px;overflow:hidden;"><small>
                 <% if i.is_a? Issue %>
-                  	<%= link_to_issue i %><%= " (#{i.project.name})" unless @project && @project == i.project %>:
+                  	<%= h("#{i.project.name} -") unless @project && @project == i.project %>
-                  	<%=h i.subject %>
+                  	<%= link_to_issue i %>:	<%=h i.subject %>
               	<% else %>
                   	<%= link_to_version i, :class => "icon icon-package" %>
               	<% end %>

             <h2><%=l(:label_project_plural)%></h2>
             <% @project_tree.keys.sort.each do |project| %>
-            <h3><%= link_to project.name, {:action => 'show', :id => project}, :class => (User.current.member_of?(project) ? "icon icon-fav" : "") %></h3>
+            <h3><%= link_to h(project.name), {:action => 'show', :id => project}, :class => (User.current.member_of?(project) ? "icon icon-fav" : "") %></h3>
             <%= textilizable(project.description, :project => project) %>
             <% if @project_tree[project].any? %>
                 <p><%= l(:label_subproject_plural) %>:
                 <%= @project_tree[project].sort.collect {|subproject|
-                   link_to(subproject.name, {:action => 'show', :id => subproject}, :class => (User.current.member_of?(subproject) ? "icon icon-fav" : ""))}.join(', ') %></p>
+                   link_to(h(subproject.name), {:action => 'show', :id => subproject}, :class => (User.current.member_of?(subproject) ? "icon icon-fav" : ""))}.join(', ') %></p>
             <% end %>
             <% end %>

             	<ul>
             	<% unless @project.homepage.blank? %><li><%=l(:field_homepage)%>: <%= auto_link @project.homepage %></li><% end %>
                 <% if @subprojects.any? %>
-             	<li><%=l(:label_subproject_plural)%>: <%= @subprojects.collect{|p| link_to(p.name, :action => 'show', :id => p)}.join(", ") %></li>
+             	<li><%=l(:label_subproject_plural)%>: <%= @subprojects.collect{|p| link_to(h(p.name), :action => 'show', :id => p)}.join(", ") %></li>
                 <% end %>
             	<% if @project.parent %>
-            	<li><%=l(:field_parent)%>: <%= link_to @project.parent.name, :controller => 'projects', :action => 'show', :id => @project.parent %></li>
+            	<li><%=l(:field_parent)%>: <%= link_to h(@project.parent.name), :controller => 'projects', :action => 'show', :id => @project.parent %></li>
             	<% end %>
             	<% for custom_value in @custom_values %>
             	<% if !custom_value.value.empty? %>

                   has_many :members, :class_name => "MantisProjectUser", :foreign_key => :project_id
                   def name
-                    read_attribute(:name)[0..29].gsub(/[^\w\s\'\-]/, '-')
+                    read_attribute(:name)[0..29]
                   end
                   def description
                   end
                   def identifier
-                    read_attribute(:name).underscore[0..11].gsub(/[^a-z0-9\-]/, '-')
+                    read_attribute(:name).underscore[0..19].gsub(/[^a-z0-9\-]/, '-')
                   end
                 end

             input[type="text"], textarea, select { padding: 2px; border: 1px solid #d7d7d7; }
             input[type="text"] { padding: 3px; }
             input[type="text"]:focus, textarea:focus, select:focus { border: 1px solid #888866; }
+            option { border-bottom: 1px dotted #d7d7d7; }
             /* Misc */
             .box { background-color: #fcfcfc; }

                                }
                              }
                            }
+                get :activity, :id => 1, :year => 3.days.ago.to_date.year, :month => 3.days.ago.to_date.month
+                assert_response :success
+                assert_template 'activity'
+                assert_not_nil assigns(:events_by_day)
                 assert_tag :tag => "h3",
                            :content => /#{3.day.ago.to_date.day}/,
-                           :sibling => { :tag => "ul",                 :child => { :tag => "li",
+                           :sibling => { :tag => "ul",
+                             :child => { :tag => "li",
                                :child => { :tag => "p",
                                  :content => /#{Issue.find(1).subject}/,
                                }