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

Explorer sle12 #214

Merged
merged 3 commits into from
Jul 30, 2020
Merged

Explorer sle12 #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f78419
Fix bsc#1163381
MalloZup Jul 17, 2020
a6e092a
Merge branch 'sle12' of github.com:ClusterLabs/hawk into sle12
MalloZup Jul 30, 2020
dff7592
Allow also users in haclient to view history explorer
MalloZup Jul 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions hawk/app/controllers/application_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,6 @@ def login_required
not_authenticated unless logged_in?
end

def god_required
permission_denied unless is_god?
end

def login_from_cookie
user = cookies['hawk_remember_me_id']
return if user.nil?
Expand Down
1 change: 0 additions & 1 deletion hawk/app/controllers/reports_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

class ReportsController < ApplicationController
before_filter :login_required
before_filter :god_required
before_filter :set_title
before_filter :set_record, only: [:show, :destroy, :download, :cache]
before_filter :set_transition, only: [:display, :detail, :graph, :logs, :diff, :pefile, :status, :cib]
Expand Down
7 changes: 6 additions & 1 deletion hawk/app/models/cib.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,7 +992,12 @@ def initialize(id, user, use_file = false, stonithwarning = false)
if rsc
rsc_state = rsc[:state]
elsif n[:host]
rsc_state = CibTools.rsc_state_from_lrm_rsc_op(@xml, n[:host], n[:id])
begin
rsc_state = CibTools.rsc_state_from_lrm_rsc_op(@xml, n[:host], n[:id])
rescue NoMethodError => e
# bsc#1163381. Catch the case resource name = node name. this is not allowed in pacemaker
error _("please check if any resources have IDs that are conflicting with node names" + "#{e.backtrace.first}: #{e.message} (#{e.class})" + rsc_id)
end
end
# node has a matching resource:
# get state from resource.rb
Expand Down