Skip to content

Commit

Permalink
Release version 0.0.6 with use of common_classes.rb
Browse files Browse the repository at this point in the history
  • Loading branch information
UweKubosch committed Jan 10, 2023
1 parent 4315423 commit 24beaad
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
}

group 'no.datek'
version '0.0.5'
version '0.0.6'

java {
withJavadocJar()
Expand Down
2 changes: 0 additions & 2 deletions src/main/resources/ruby/common_classes.rb

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/resources/ruby/load_slim.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file is loaded once for every view that is instantiated.
# It uses (requires) a separate file to avoid loading the same code multiple times.
require 'ruby/slim_helper'
require 'source_reloader' if Java::no.datek.dlcsuper.util.SystemUtils.development?
require 'source_reloader' if SystemUtils.development?
3 changes: 1 addition & 2 deletions src/main/resources/ruby/slim_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ module SlimHelper
include FormHelper

import Java::JavaTime::LocalDateTime
import Java::no.datek.dlcsuper.util::DateUtils
import Java::OrgSpringframeworkSecurityCoreContext::SecurityContextHolder
import Java::OrgSpringframeworkWebContextRequest::RequestContextHolder
import Java::OrgSpringframeworkWebServletSupport::RequestContextUtils
Expand Down Expand Up @@ -236,7 +235,7 @@ def [](field_name)
yield bs
end

def formatDateTime(date_time, format = 'yyyy-MM-dd HH:mm:ss', timeZoneId: nil)
def formatDateTime(date_time, format = 'yyyy-MM-dd HH:mm:ss', timeZoneId: TimeZoneHelper.current_timezone(user))
if date_time.nil?
return ''
end
Expand Down

0 comments on commit 24beaad

Please sign in to comment.