Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix migration on redmine 3.1 #1112

Open
wants to merge 2 commits into
base: feature/redmine3
Choose a base branch
from
Open

fix migration on redmine 3.1 #1112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d11a6b8
fix migration on redmine 3.1
Nov 18, 2015
2042b2d
displaying sprint description in taskboard
inclooder Mar 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/models/rb_issue_history.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ def self.rebuild_issue(issue, status=nil)
}

if ActiveRecord::Base.connection.tables.include?('rb_journals')
RbJournal.all(:conditions => ['issue_id=?', issue.id], :order => 'timestamp asc').each{|j|
RbJournal.where('issue_id=?', 601).order('timestamp asc').each{|j|
date = j.timestamp.to_date
full_journal[date] ||= {}
case j.property
Expand Down
1 change: 1 addition & 0 deletions app/views/rb_taskboards/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@

<%- content_for :main do %>
<span id="userid" style="visibility:hidden;"><%= User.current.id %></span>
<div class="sprint_description_taskboard"><%= @sprint.description %></div>
<div id="taskboard">


Expand Down
4 changes: 4 additions & 0 deletions assets/stylesheets/taskboard.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,3 +400,7 @@ See RB.Taskboard.initialize()
#project_quick_jump_box{
max-width: 300px;
}

.sprint_description_taskboard {
margin: 5px 10px 5px 10px;
}