Commit 1d697880 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

fix encoding error, issues critical status added

parent 016012b1
......@@ -647,3 +647,37 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
background: none repeat scroll 0 0 #FFBBBB
}
}
.tag {
@include round-borders-all(4px);
padding:2px 4px;
border:none;
&.high {
background: #D12F19;
color:white;
}
&.today {
background: #44aa22;
color:white;
}
&.yours {
background: #4466cc;
color:white;
}
&.notes {
background: #2c5c66;
color:white;
}
}
#issues-table .issue {
&.critical {
td {
//background: #D12F19;
//color:#fff;
}
}
}
......@@ -12,7 +12,7 @@ class IssuesController < ApplicationController
def index
@issues = case params[:f].to_i
when 1 then @project.issues.all
when 1 then @project.issues
when 2 then @project.issues.closed
when 3 then @project.issues.opened.assigned(current_user)
else @project.issues.opened
......
......@@ -18,11 +18,22 @@ class Issue < ActiveRecord::Base
:presence => true,
:length => { :within => 0..2000 }
scope :critical, where(:critical => true)
scope :non_critical, where(:critical => false)
scope :opened, where(:closed => false)
scope :closed, where(:closed => true)
scope :assigned, lambda { |u| where(:assignee_id => u.id)}
acts_as_list
def today?
Date.today == created_at.to_date
end
def new?
today? && created_at == updated_at
end
end
# == Schema Information
#
......
......@@ -11,7 +11,7 @@
= image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
%p
%strong
= commit.truncated_message
= truncate(commit.safe_message, :length => 60)
= link_to "Browse Code", tree_project_path(@project, :commit_id => commit.id), :class => "lite_button", :style => "float:right"
= link_to truncate(commit.id.to_s, :length => 16), project_commit_path(@project, :id => commit.id), :class => "lite_button", :style => "width:120px;float:right"
%span
......
%h3
= "[ #{@commit.committer} ] #{@commit.truncated_message(40)}"
= "[ #{@commit.committer} ] #{truncate(@commit.safe_message)}"
-#= link_to 'Back', project_commits_path(@project), :class => "button"
%table.round-borders
%tr
......@@ -16,7 +16,7 @@
%td= @commit.committed_date
%tr
%td Message
%td= @commit.message
%td= @commit.safe_message
%tr
%td Tree
%td= link_to 'Browse Code', tree_project_path(@project, :commit_id => @commit.id)
......
......@@ -5,17 +5,21 @@
- @issue.errors.full_messages.each do |msg|
%li= msg
.span-6
.span-8
= f.label :title
= f.text_field :title, :style => "width:450px"
.span-6
.span-8
= f.label :content
= f.text_area :content, :style => "width:450px; height:130px"
.span-6.append-bottom
.span-8.append-bottom
= f.label :assignee_id
= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" })
.span-1
= f.label :critical, "Critical"
%br
= f.check_box :critical
- unless @issue.new_record?
.span-3.right
.span-2.right
= f.label :closed
%br
= f.check_box :closed
......
%table.round-borders#issues-table
%tr
- if can?(current_user, :admin_issue, @project) && !params[:f] || params[:f] == "0"
%th
%th Assignee
%th ID
%th Title
%th Closed?
%th
- @issues.each do |issue|
- @issues.critical.each do |issue|
= render(:partial => 'show', :locals => {:issue => issue})
- @issues.non_critical.each do |issue|
= render(:partial => 'show', :locals => {:issue => issue})
%tr{ :id => dom_id(issue), :class => "issue", :url => project_issue_path(@project, issue) }
%tr{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(@project, issue) }
- if can?(current_user, :admin_issue, @project) && !params[:f] || params[:f] == "0"
%td
= image_tag "move.png" , :class => [:handle, :left]
%td
= image_tag "move.png" , :class => [:handle, :left]
= image_tag gravatar_icon(issue.assignee.email), :class => "left", :width => 40, :style => "padding:0 5px;"
= truncate issue.assignee.name, :lenght => 20
%td ##{issue.id}
%td= html_escape issue.title
%td
= html_escape issue.title
%br
- if issue.critical
%span.tag.high critical
- if issue.today?
%span.tag.today today
-#- if issue.author == current_user
-#%span.tag.yours yours
-#- if issue.notes.count > 0
-#%span.tag.notes
-#= issue.notes.count
-#notes
%td
- if can? current_user, :write_issue, @project
= form_for([@project, issue], :remote => true) do |f|
......
......@@ -6,7 +6,7 @@
= image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
%p{:style => "margin-bottom: 3px;"}
%strong
= link_to commit.truncated_message(60), project_commit_path(@project, :id => commit.id)
= link_to truncate(commit.safe_message, :length => 60), project_commit_path(@project, :id => commit.id)
%span
%span.author
......
......@@ -19,7 +19,7 @@
- css_class = "dash_commit"
- commit = parent
- item_code = commit.author.email
- link_item_name = commit.truncated_message(50)
- link_item_name = truncate(commit.safe_message, :length => 50)
- link_to_item = project_commit_path(@project, :id => commit.id)
- else
- css_class = "dash_wall"
......
......@@ -12,4 +12,4 @@
= time_ago_in_words(content_commit.committed_date)
ago
%td
= link_to content_commit.truncated_message(40), project_commit_path(@project, content_commit)
= link_to truncate(content_commit.safe_message, :length => 40), project_commit_path(@project, content_commit)
class AddHighLabelToIssue < ActiveRecord::Migration
def change
add_column :issues, :critical, :boolean, :default => false, :null => false
end
end
......@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20111021101550) do
ActiveRecord::Schema.define(:version => 20111025134235) do
create_table "issues", :force => true do |t|
t.string "title"
......@@ -23,6 +23,7 @@ ActiveRecord::Schema.define(:version => 20111021101550) do
t.datetime "updated_at"
t.boolean "closed", :default => false, :null => false
t.integer "position", :default => 0
t.boolean "critical", :default => false, :null => false
end
create_table "keys", :force => true do |t|
......
module CommitExt
# Cause of encoding rails truncate raise error
# this method is temporary decision
def truncated_message(size = 80)
message.length > size ? (message[0..(size - 1)] + "...") : message
def safe_message
message.encode("UTF-8",
:invalid => :replace,
:undef => :replace,
:universal_newline => true,
:replace => "")
rescue
"-- invalid encoding for commit message"
end
......
......@@ -10,7 +10,9 @@ describe "TeamMembers" do
describe "View profile" do
it "should be available" do
visit(team_project_path(@project))
find(:xpath, "//table[@id='team-table']//a[1]").click
within "#team-table" do
click_link(@user.name)
end
page.should have_content @user.skype
page.should_not have_content 'Twitter'
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment