ref: refs/heads/master
commit 9e58ee833384f96850ace49be861358df39d2d8b
Author: Stefan Schubert
Date: Wed Jul 22 16:26:33 2009 +0200
bugfix for endless loop
---
.../app/controllers/permissions_controller.rb | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/plugins/permissions/app/controllers/permissions_controller.rb b/plugins/permissions/app/controllers/permissions_controller.rb
index 95364c8..cee9a5e 100644
--- a/plugins/permissions/app/controllers/permissions_controller.rb
+++ b/plugins/permissions/app/controllers/permissions_controller.rb
@@ -74,7 +74,6 @@ class PermissionsController < ApplicationController
end
def construct_permission_tree()
- @right_set_permissions = false
@permissions.each do |permission|
sub = @permission_tree
#do not regard org.opensuse.yast. in the tree
@@ -101,7 +100,7 @@ class PermissionsController < ApplicationController
node = Hash.new
node[:level] = level
node[:label] = key
- node[:path] = branch[:path]
+ node[:path] = branch[:path] if branch.has_key?(:path)
#taking the subtrees too
next_take_all = take_all
if (branch.has_key?(:grant) &&
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
