Compare commits

..

No commits in common. 'main' and 'dev' have entirely different histories.
main ... dev

  1. 2
      frontend/src/routes/files/Index.svelte
  2. 5
      stock/src/main/java/de/srsoftware/umbrella/stock/SqliteDb.java
  3. 4
      web/src/main/resources/web/css/bloodshed.css
  4. 6
      web/src/main/resources/web/css/default.css
  5. 6
      web/src/main/resources/web/css/winter.css

2
frontend/src/routes/files/Index.svelte

@ -6,7 +6,7 @@
import { t } from '../../translations.svelte'; import { t } from '../../translations.svelte';
import { user } from '../../user.svelte'; import { user } from '../../user.svelte';
const image_extensions = ['jpg','jpeg','gif','png','svg','webp']; const image_extensions = ['jpg','jpeg','gif','png','svg'];
const router = useTinyRouter(); const router = useTinyRouter();
let children = $state({}); let children = $state({});
let new_dir = $state(null); let new_dir = $state(null);

5
stock/src/main/java/de/srsoftware/umbrella/stock/SqliteDb.java

@ -1,7 +1,6 @@
/* © SRSoftware 2025 */ /* © SRSoftware 2025 */
package de.srsoftware.umbrella.stock; package de.srsoftware.umbrella.stock;
import static de.srsoftware.tools.Optionals.is0;
import static de.srsoftware.tools.Optionals.nullIfEmpty; import static de.srsoftware.tools.Optionals.nullIfEmpty;
import static de.srsoftware.tools.jdbc.Condition.equal; import static de.srsoftware.tools.jdbc.Condition.equal;
import static de.srsoftware.tools.jdbc.Condition.isNull; import static de.srsoftware.tools.jdbc.Condition.isNull;
@ -303,11 +302,11 @@ public class SqliteDb extends BaseDb implements StockDb {
@Override @Override
public DbLocation save(DbLocation location) { public DbLocation save(DbLocation location) {
var parentId = is0(location.parent()) ? null : location.parent(); var parentId = location.parent() == 0 ? null : location.parent();
if (location.id() == 0) { // new location if (location.id() == 0) { // new location
try { try {
var rs = insertInto(TABLE_LOCATIONS,OWNER,PARENT_LOCATION_ID,NAME,DESCRIPTION) var rs = insertInto(TABLE_LOCATIONS,OWNER,PARENT_LOCATION_ID,NAME,DESCRIPTION)
.values(location.owner().dbCode(),parentId,location.name(),location.description()) .values(location.owner().dbCode(),location.parent() == 0 ? null : parentId,location.name(),location.description())
.execute(db).getGeneratedKeys(); .execute(db).getGeneratedKeys();
long id = 0; long id = 0;
if (rs.next()) id = rs.getLong(1); if (rs.next()) id = rs.getLong(1);

4
web/src/main/resources/web/css/bloodshed.css

@ -53,10 +53,6 @@ footer {
margin: 5px; margin: 5px;
} }
img {
max-width: 100%;
}
nav { nav {
position: sticky; position: sticky;
z-index: 100; z-index: 100;

6
web/src/main/resources/web/css/default.css

@ -41,7 +41,7 @@ fieldset[tabindex="0"]{
overflow: hidden; overflow: hidden;
} }
fieldset[tabindex="0"]:hover{ fieldset[tabindex="0"]:focus-within{
max-height: unset; max-height: unset;
} }
@ -53,10 +53,6 @@ footer {
margin: 5px; margin: 5px;
} }
img {
max-width: 100%;
}
nav { nav {
position: sticky; position: sticky;
z-index: 100; z-index: 100;

6
web/src/main/resources/web/css/winter.css

@ -41,7 +41,7 @@ fieldset[tabindex="0"]{
overflow: hidden; overflow: hidden;
} }
fieldset[tabindex="0"]:hover{ fieldset[tabindex="0"]:focus-within{
max-height: unset; max-height: unset;
} }
@ -53,10 +53,6 @@ footer {
margin: 5px; margin: 5px;
} }
img {
max-width: 100%;
}
nav { nav {
position: sticky; position: sticky;
z-index: 100; z-index: 100;

Loading…
Cancel
Save