antville/antville
antville/antville
1
1
Fork 0
Code Issues 48 Pull requests 17 Projects Releases 9 Wiki Activity Actions 1

Merge remote-tracking branch 'origin/main' into refactor_setting_of_root_cookie

Browse source
This commit is contained in:
Tobi Schäfer 2026-01-02 15:17:57 +01:00
commit a2e96cc1fa
Signed by: tobi
GPG key ID: 91FAE6FE2EBAC4C8
3 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
code/Skin/Skin.js
View file

@ -223,6 +223,9 @@ Skin.prototype.compare_action = function() {
res.push(); res.push();
var param = {}, leftLineNumber = rightLineNumber = 0; var param = {}, leftLineNumber = rightLineNumber = 0;
for (let line of diff) { for (let line of diff) {
if (!line) {
continue;
}
if (line.deleted) { if (line.deleted) {
param.right = encode(line.value); param.right = encode(line.value);
param.leftStatus = 'added'; param.leftStatus = 'added';
@ -249,7 +252,7 @@ Skin.prototype.compare_action = function() {
this.renderSkin('$Skin#difference', param); this.renderSkin('$Skin#difference', param);
} }
} }
if (line.value !== null) { if (line.value !== null && typeof line.value !== 'undefined') {
leftLineNumber += 1; leftLineNumber += 1;
rightLineNumber += 1; rightLineNumber += 1;
param.leftLineNumber = leftLineNumber; param.leftLineNumber = leftLineNumber;

2
db/h2.compat/db.properties
View file

@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
antville.url = jdbc:h2:./db/antville;ifexists=true;mode=postgresql antville.url = jdbc:h2:./db/antville;ifexists=true;mode=postgresql;non_keywords=value
antville.driver = org.h2.Driver antville.driver = org.h2.Driver
antville.user = antville antville.user = antville
antville.password = antville antville.password = antville

12
tools/antclick/build.gradle
View file

@ -11,7 +11,7 @@ clean {
} }
dependencies { dependencies {
implementation 'com.h2database:h2:1.4.200' implementation 'com.h2database:h2:2.2.220'
} }
configurations { configurations {
@ -112,9 +112,8 @@ tasks.register('installJars', Copy) {
tasks.register('buildDatabase', JavaExec) { tasks.register('buildDatabase', JavaExec) {
description 'Builds the H2 SQL database file.' description 'Builds the H2 SQL database file.'
group 'build' group 'build'
dependsOn ':assemble'
def inputFile = "$antvilleInstallDir/db/postgre.sql" def inputFile = "${project.rootDir}/db/postgre.sql"
def outputDir = "$helmaInstallDir/db" def outputDir = "$helmaInstallDir/db"
inputs.file inputFile inputs.file inputFile
@ -130,7 +129,7 @@ tasks.register('buildDatabase', JavaExec) {
args = [ args = [
'-continueOnError', '-continueOnError',
'-script', inputFile, '-script', inputFile,
'-url', "jdbc:h2:$outputDir/antville", '-url', "jdbc:h2:$outputDir/antville;mode=postgresql;non_keywords=value",
'-user', 'antville', '-user', 'antville',
'-password', 'antville' '-password', 'antville'
] ]
@ -165,7 +164,7 @@ task assembleDist {
tasks.register('runH2Console', JavaExec) { tasks.register('runH2Console', JavaExec) {
description 'Runs the H2 SQL database console.' description 'Runs the H2 SQL database console.'
group 'Help' group 'Help'
dependsOn 'installJars' dependsOn 'buildDatabase'
def h2Jar = configurations.library.files.find { jar -> def h2Jar = configurations.library.files.find { jar ->
jar.name.startsWith('h2') jar.name.startsWith('h2')
@ -178,9 +177,6 @@ tasks.register('runH2Console', JavaExec) {
'-user', 'antville', '-user', 'antville',
'-password', 'antville' '-password', 'antville'
] ]
// standardOutput = new ByteArrayOutputStream()
// ignoreExitValue true
} }
tasks.register('distZip', Zip) { tasks.register('distZip', Zip) {