rubyon
/
farmitry_hvac
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: rubyon:faaf8677e3b79e679074e993ecca48d7393e044f
Branches Tags
rubyon:main
rubyon:develop_mh_new
rubyon:develop_mh
...
compare: rubyon:55715a20eb6256523be8d6a07591cd7680fca5d3
Branches Tags
rubyon:develop_mh_new
rubyon:develop_mh
rubyon:main

2 Commits
faaf8677e3 ... 55715a20eb

Author SHA1 Message Date
ming 55715a20eb scroll y area height fix 해제 2025-04-25 13:53:20 +09:00
RubyOn 29841e2d15 스케쥴이 nil 일때 처리 2025-04-25 13:50:16 +09:00
2 changed files with 5 additions and 5 deletions
Show Stats Expand all files Collapse all files

2
app/controllers/schedules_controller.rb
View File

@ -49,7 +49,7 @@ class SchedulesController < ApplicationController
def schedule_edit_update def schedule_edit_update
error_messages = [] error_messages = []
params[:schedule].each do |id, attributes| params[:schedule]&.each do |id, attributes|
schedule = Schedule.find_by(id: id) schedule = Schedule.find_by(id: id)
next unless schedule next unless schedule

8
app/views/layouts/application.html.erb
View File

@ -23,20 +23,20 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css">
</head> </head>
<body class="h-screen overflow-hidden bg-base-background text-base-text min-w-[400px] overflow-x-auto"> <body class="min-h-screen bg-base-background text-base-text min-w-[400px] overflow-x-auto h-full">
<%= turbo_frame_tag :modals %> <%= turbo_frame_tag :modals %>
<main class="flex flex-col h-full"> <main class="flex flex-col h-full">
<%= render "partials/header" %> <%= render "partials/header" %>
<div class="flex flex-row flex-1 w-full overflow-hidden"> <div class="flex flex-row flex-1 w-full">
<%= render "partials/sidebar" %> <%= render "partials/sidebar" %>
<div class="flex-1 h-full pb-4 pr-4"> <div class="flex-1 h-full pb-4 pr-4">
<div class="flex-1 h-full content"> <div class="flex-1 h-full content">
<% if flash[:notice] %> <% if flash[:notice] %>
<div class="m-4 rounded px-4 py-2 bg-accept text-white"> <div class="rounded px-4 py-2 bg-accept text-white">
<%= raw flash[:notice] %> <%= raw flash[:notice] %>
</div> </div>
<% elsif flash[:alert] %> <% elsif flash[:alert] %>
<div class="m-4 rounded px-4 py-2 bg-danger text-white"> <div class="rounded px-4 py-2 bg-danger text-white">
<%= raw flash[:alert] %> <%= raw flash[:alert] %>
</div> </div>
<% end %> <% end %>