Skip to content

Commit

Permalink
Merge pull request #323 from intermediateengineering/fix/compilation
Browse files Browse the repository at this point in the history
Fix various compiler warnings and errors
  • Loading branch information
ghenry authored Dec 11, 2024
2 parents 314fedb + f1dea1d commit 73419a5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions lib/kaffy/resource_query.ex
Original file line number Diff line number Diff line change
Expand Up @@ -177,15 +177,15 @@ defmodule Kaffy.ResourceQuery do
term_type == :string do
term = "%#{term}%"

from([..., r] in current_query,
from(r in current_query,
or_where: ilike(type(field(r, ^f), :string), ^term)
)
else
if Kaffy.ResourceSchema.field_type(schema, f) in [:id, :integer] and
term_type == :decimal do
current_query
else
from([..., r] in current_query,
from(r in current_query,
or_where: field(r, ^f) == ^term
)
end
Expand Down
4 changes: 2 additions & 2 deletions lib/kaffy_web/templates/home/_chart.html.eex
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<div class="clearfix">
<h4 class="card-title float-left"><%= @widget.title %></h4>
</div>
<%# <div class="kaffy-chart-container" style="position:relative;height:200px;"> %>
<% # <div class="kaffy-chart-container" style="position:relative;height:200px;"> %>
<canvas id="<%= :crypto.strong_rand_bytes(6) |> Base.url_encode64() %>" class="mt-2"></canvas>
<%# </div> %>
<% # </div> %>
</div>
</div>
</div>

0 comments on commit 73419a5

Please sign in to comment.