search for: get_login_user

I've rebased the patch series to the current next branch and am sending them again.

This resend includes the rebase, but fixes a problem I just noticed with nil/empty checks.

This is a resend of the 2-patch series from a week or so ago, needed to be rebased due to some commits on next

The following two patches should be applied in the order: * [PATCH server] Add svc_vm_actions method to VmService. * [PATCH server] Cloud UI layer to initiate actions on vms. The service layer patch should work fine on its own (and not break anything), but cloud patch relies on service being there.

...tils") + +require "rubygems" +require 'monitor' +require 'dutils' +require 'daemons' +require 'logger' + +require 'qmf' +require 'socket' + +include Daemonize + +class VmQmfController + include VmService + + attr_accessor :vm + + def get_login_user + return "ovirtadmin" + end +end + + +class Ovirt + + TABLE_ID = 1 + + def initialize(agent, logger) + + @agent = agent + @logger = logger + + @ovirt_class = Qmf::SchemaObjectClass.new("org.ovirt.ovirt", "Ovirt") + @ovirt_class.add_property(Qmf::Schem...

...return (ENV["RAILS_ENV"] != "production")?'components/' << params[:component_layout]:'redux' - end - return 'redux' - end - - def is_logged_in - redirect_to(:controller => "/login", :action => "login") unless get_login_user - end - - def get_help_section - help = HelpSection.find(:first, :conditions => [ "controller = ? AND action = ?", controller_name, action_name ]) - @help_section = help ? help.section : "" - if @help_section.index('#') - help_sections = @help_...

.... + + +# This module is used to bootstrap testing for the service api, +# which depends on certain methods existing in the class which includes it. +# Clearly this is not the case with unit tests on the modules themselves, +# so any dependencies are set up here. +module ServiceModuleHelper + + def get_login_user + return @user + end + + def set_login_user(user=nil) + @user = user + end +end \ No newline at end of file diff --git a/src/app/services/vm_service.rb b/src/app/services/vm_service.rb index 3d9777c..a78e17d 100644 --- a/src/app/services/vm_service.rb +++ b/src/app/services/vm_service.rb @...

Note that one of the 8 patches (#6) will be sent separately in reply to this email, as some of the replaced lines are too long, so git won't let me send the email. However, there is nothing wrong with that patch, and it should be applied in the sequence listed below. Note also that I assume this will be tested on a clean f11 install, rather than an upgrade of an existing ovirt server

...s Cloud::CloudController < ApplicationController + include VmService + + layout 'cloud/cloud' + + before_filter :set_vars + + protected + + + # NOTE: This probably will/should be moved to use set_perms in + # ApplicationService once that is ready to go. + def set_vars + @user = get_login_user + end +end diff --git a/src/app/controllers/cloud/dashboard_controller.rb b/src/app/controllers/cloud/dashboard_controller.rb new file mode 100644 index 0000000..8fd0f02 --- /dev/null +++ b/src/app/controllers/cloud/dashboard_controller.rb @@ -0,0 +1,24 @@ +# +# Copyright (C) 2009 Red Hat, Inc. +#...