Skip to content

Commit

Permalink
Fix a wrongly merge in StagingWorkflowController
Browse files Browse the repository at this point in the history
Some of the instance variables calculated in the show ended up in the
edit LoL

Co-authored-by: David Kang <dkang@suse.com>
  • Loading branch information
Moises Deniz Aleman and DavidKang committed Nov 8, 2018
1 parent fd109e3 commit 38020a4
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/api/app/controllers/webui/staging_workflows_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,6 @@ def create

def show
@project = @staging_workflow.project
end

def edit
authorize @staging_workflow

@project = @staging_workflow.project
@unassigned_requests = @staging_workflow.unassigned_requests.first(5)
@more_unassigned_requests = @staging_workflow.unassigned_requests.count - @unassigned_requests.size
@ready_requests = @staging_workflow.ready_requests.first(5)
Expand All @@ -47,6 +41,12 @@ def edit
@empty_projects = @staging_workflow.staging_projects.without_staged_requests
end

def edit
authorize @staging_workflow

@project = @staging_workflow.project
end

private

def set_bootstrap_views
Expand Down

0 comments on commit 38020a4

Please sign in to comment.