Upstream sync

This commit is contained in:
Senad Uka
2020-07-03 10:23:03 +02:00
parent d6a3542308
commit 2dea0f29b9
32 changed files with 860 additions and 72 deletions

View File

@@ -4,6 +4,7 @@ class TaskRequestsController < ApplicationController
before_action :set_project
before_action :build_task_request, only: [:new, :create]
before_action :set_task_request, only: [:show, :edit, :update, :cancel]
before_action :show_splash_screen, only: :index
def index
@task_requests = task_requests.order_by_recent.paginate(page: params[:page])
@@ -46,6 +47,10 @@ class TaskRequestsController < ApplicationController
private
def show_splash_screen
render :splash if task_requests.count.zero?
end
def task_request_params
params.require(:task_request).permit(:description, :deadline, :time_allowed, :additional_notes, files: [])
end