diff options
| author | randx <dmitriy.zaporozhets@gmail.com> | 2012-07-28 05:43:34 +0300 |
|---|---|---|
| committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-07-28 05:43:34 +0300 |
| commit | e8261313a71fb69adeedc15e15fb572282ceaf06 (patch) | |
| tree | eed37b9287b6575bb2217edfcf811f11fb05aaa0 /app/views/issues | |
| parent | 058b71edf3eed2aa2f4f664a0731e52c57b157ce (diff) | |
| download | gitlab-ce-e8261313a71fb69adeedc15e15fb572282ceaf06.tar.gz | |
Fixed firefox css bug with issues table
Diffstat (limited to 'app/views/issues')
| -rw-r--r-- | app/views/issues/_show.html.haml | 5 | ||||
| -rw-r--r-- | app/views/issues/index.html.haml | 14 |
2 files changed, 10 insertions, 9 deletions
diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml index 574777be384..37f173702be 100644 --- a/app/views/issues/_show.html.haml +++ b/app/views/issues/_show.html.haml @@ -1,6 +1,7 @@ %li.wll{ :id => dom_id(issue), :class => issue_css_classes(issue), :url => project_issue_path(issue.project, issue) } - .issue_check - = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, :class => "selected_issue", :disabled => !can?(current_user, :modify_issue, issue) + - if controller.controller_name == 'issues' + .issue_check + = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, :class => "selected_issue", :disabled => !can?(current_user, :modify_issue, issue) .right - issue.labels.each do |label| %span.label.label-issue.grouped diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml index f033536e686..27eff501578 100644 --- a/app/views/issues/index.html.haml +++ b/app/views/issues/index.html.haml @@ -22,13 +22,13 @@ .issues_bulk_update.hide = form_tag bulk_update_project_issues_path(@project), :method => :post do - %span Update selected issues with - - = select_tag('update[status]', options_for_select(['open', 'closed']), :prompt => "Status") - = select_tag('update[assignee_id]', options_from_collection_for_select(@project.users.all, "id", "name", params[:assignee_id]), :prompt => "Assignee") - = select_tag('update[milestone_id]', options_from_collection_for_select(@project.milestones.order("id desc").all, "id", "title", params[:milestone_id]), :prompt => "Milestone") - = hidden_field_tag 'update[issues_ids]', [] - = hidden_field_tag :f, params[:f] + %span.update_issues_text Update selected issues with + .left + = select_tag('update[status]', options_for_select(['open', 'closed']), :prompt => "Status") + = select_tag('update[assignee_id]', options_from_collection_for_select(@project.users.all, "id", "name", params[:assignee_id]), :prompt => "Assignee") + = select_tag('update[milestone_id]', options_from_collection_for_select(@project.milestones.order("id desc").all, "id", "title", params[:milestone_id]), :prompt => "Milestone") + = hidden_field_tag 'update[issues_ids]', [] + = hidden_field_tag :f, params[:f] = button_tag "Save", :class => "btn update_selected_issues" .issues_filters .left |