Project

General

Profile

Revision 1cd46bac

Added by Ondřej Pražák about 8 years ago

minor improvements

View differences:

app/controllers/integration/api/jenkins_users_controller.rb
6 6 

  		




  7
  7
  
    
    before_filter :find_organization, :only => [:create, :index]


  		




  8
  8
  
    
    before_filter :find_jenkins_user, :only => [:show, :destroy]


  		




  
  9
  
    
    before_filter :find_job, :only => [:create]


  		




  9
  10
  
    

  		




  10
  11
  
    
    def index


  		




  11
  12
  
    
       ids = JenkinsUser.readable


  		




  12
  13
  
    
            .where(:organization_id => @organization.id, :jenkins_instance_id => params[:jenkins_instance_id])


  		




  13
  14
  
    
            .pluck(:id)


  		




  14
  
  
    

  		




  15
  15
  
    
      filters = [:terms => {:id => ids}]       


  		




  16
  16
  
    

  		




  17
  17
  
    
      options = {


  		




  ......




  27
  27
  
    

  		




  28
  28
  
    
    def create


  		




  29
  29
  
    
      @jenkins_user = JenkinsUser.new(jenkins_user_params)


  		




  
  30
  
    
      @jenkins_user.owner = ::User.current


  		




  
  31
  
    
      fail ::Katello::HttpErrors::Conflict, "Could not create Jenkins User:


  		




  
  32
  
    
                                             No Jenkins Instance set for Job " if @job.jenkins_instance.nil?


  		




  
  33
  
    
      @jenkins_user.jenkins_instance = @job.jenkins_instance


  		




  30
  34
  
    
      @jenkins_user.organization = @organization


  		




  
  35
  
    
      binding.pry


  		




  31
  36
  
    
      @jenkins_user.save!


  		




  32
  37
  
    

  		




  33
  38
  
    
      respond_for_show(:resource => @jenkins_user)


  		




  ......




  46
  51
  
    
      fail ::Katello::HttpErrors::NotFound, "Could not find Jenkins User with id #{params[:id]}" if @jenkins_user.nil?


  		




  47
  52
  
    
      @jenkins_user 


  		




  48
  53
  
    
    end


  		




  
  54
  
    

  		




  
  55
  
    
    def find_job


  		




  
  56
  
    
      @job = Job.find_by_id(params[:job_id])


  		




  
  57
  
    
      fail ::Katello::HttpErrors::NotFound, "Could not find job with id #{params[:job_id]}" if @job.nil?


  		




  
  58
  
    
      @job 


  		




  
  59
  
    
    end


  		




  
  60
  
    

  		




  
  61
  
    
    def jenkins_user_params


  		




  
  62
  
    
      params.require(:jenkins_user).permit(:name, :token, :job_id)


  		




  
  63
  
    
    end


  		




  49
  64
  
    
    


  		




  50
  65
  
    
  end


  		




  51
  66
  
    
end


  		












Also available in:  Unified diff