Skip to content

Commit 2840144

Browse files
author
Guillaume DUPE
committed
change css z-index to prevent search menu to pass under backlog menu
1 parent 62d5979 commit 2840144

9 files changed

Lines changed: 15 additions & 12 deletions

File tree

app/controllers/rb_impediments_controller.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class RbImpedimentsController < RbApplicationController
44
unloadable
55

66
def create
7-
@settings = Backlogs.settings
7+
@settings = Backlogs.setting
88
begin
99
@impediment = RbTask.create_with_relationships(params, User.current.id, @project.id, true)
1010
rescue => e
@@ -23,7 +23,7 @@ def create
2323

2424
def update
2525
@impediment = RbTask.find_by_id(params[:id])
26-
@settings = Backlogs.settings
26+
@settings = Backlogs.setting
2727
begin
2828
result = @impediment.update_with_relationships(params)
2929
rescue => e

app/controllers/rb_releases_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def edit
4949
def update
5050
except = ['id', 'project_id']
5151
attribs = params.select{|k,v| (!except.include? k) and (RbRelease.column_names.include? k) }
52-
attribs = Hash[*attribs.flatten]
52+
attribs = attribs.to_enum.to_h
5353
begin
5454
result = @release.update_attributes attribs
5555
rescue => e

app/controllers/rb_sprints_controller.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class RbSprintsController < RbApplicationController
1212

1313
def create
1414
attribs = params.select{|k,v| k != 'id' and RbSprint.column_names.include? k }
15-
attribs = Hash[*attribs.flatten]
15+
attribs = attribs.to_enum.to_h
1616
@sprint = RbSprint.new(attribs)
1717

1818
#share the sprint according to the global setting
@@ -43,7 +43,7 @@ def create
4343
def update
4444
except = ['id', 'project_id']
4545
attribs = params.select{|k,v| (!except.include? k) and (RbSprint.column_names.include? k) }
46-
attribs = Hash[*attribs.flatten]
46+
attribs = attribs.to_enum.to_h
4747
begin
4848
result = @sprint.update_attributes attribs
4949
rescue => e

app/controllers/rb_taskboards_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ def show
77
stories = @sprint.stories
88
@story_ids = stories.map{|s| s.id}
99

10-
@settings = Backlogs.settings
10+
@settings = Backlogs.setting
1111

1212
## determine status columns to show
1313
tracker = Tracker.find_by_id(RbTask.tracker)

app/controllers/rb_tasks_controller.rb

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ class RbTasksController < RbApplicationController
44
unloadable
55

66
def create
7-
@settings = Backlogs.settings
7+
params.permit!
8+
@settings = Backlogs.setting
89
@task = nil
910
begin
1011
@task = RbTask.create_with_relationships(params, User.current.id, @project.id)
1112
rescue => e
13+
Rails.logger.debug(e.to_yaml)
1214
render :text => e.message.blank? ? e.to_s : e.message, :status => 400
1315
return
1416
end
@@ -23,8 +25,9 @@ def create
2325
end
2426

2527
def update
28+
params.permit!
2629
@task = RbTask.find_by_id(params[:id])
27-
@settings = Backlogs.settings
30+
@settings = Backlogs.setting
2831
result = @task.update_with_relationships(params)
2932
status = (result ? 200 : 400)
3033
@include_meta = true

app/models/rb_story.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ def self.create_and_position(params)
175175
attribs = params.select{|k,v| !['prev', 'next', 'id', 'lft', 'rgt'].include?(k) && RbStory.column_names.include?(k) }
176176

177177
attribs[:status] = RbStory.class_default_status
178-
attribs = attribs.to_enum.to_h#Hash[*attribs.flatten]
178+
attribs = attribs.to_enum.to_h
179179
s = RbStory.new(attribs)
180180
s.save
181181
s.position!(params)

app/models/rb_task.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def self.rb_safe_attributes(params)
5959
attribs = params.select {|k,v| safe_attributes_names.include?(k) }
6060
# lft and rgt fields are handled by acts_as_nested_set
6161
attribs = attribs.select{|k,v| k != 'lft' and k != 'rgt' }
62-
attribs = Hash[*attribs.flatten] if attribs.is_a?(Array)
62+
attribs = attribs.to_enum.to_h if attribs.is_a?(Array)
6363
return attribs
6464
end
6565

assets/stylesheets/global.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ a:hover{
3030
position:relative;
3131
width:100%;
3232
box-shadow: 0 3px 4px #A0A0A0;
33-
z-index:1000;
33+
z-index:98;
3434
border-radius: 10px;
3535
}
3636
#toolbar .breadcrumbs{

assets/stylesheets/taskboard.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ See RB.Taskboard.initialize()
4444
margin-bottom:0;
4545
margin-right:10px;
4646
position: absolute;
47-
z-index: 200;
47+
z-index: 100;
4848
}
4949
#board_header td{
5050
background-color:#EEEEEE;

0 commit comments

Comments
 (0)