version 4.0.1 ready (#484)

LycheeOrg · Apr 19, 2020 · 49d5862 · 49d5862
1 parent 08501c5
commit 49d5862
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 4 deletions.
diff --git a/database/migrations/2020_04_19_122905_bump_version.php b/database/migrations/2020_04_19_122905_bump_version.php
@@ -0,0 +1,27 @@
+<?php
+
+use App\Configs;
+use Illuminate\Database\Migrations\Migration;
+
+class BumpVersion extends Migration
+{
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Configs::where('key', 'version')->update(['value' => '040001']);
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Configs::where('key', 'version')->update(['value' => '040000']);
+	}
+}
diff --git a/public/Lychee-front b/public/Lychee-front
diff --git a/public/dist/main.js b/public/dist/main.js
diff --git a/public/dist/view.js b/public/dist/view.js
@@ -1088,7 +1088,7 @@ header.setMode = function (mode) {
 
 			// Hide download button when album empty or we are not allowed to
 			// upload to it and it's not explicitly marked as downloadable.
-			if (!album.json || album.json.photos === false || !album.isUploadable() && album.json.downloadable === '0') {
+			if (!album.json || album.json.photos === false && album.json.albums && album.json.albums.length === 0 || !album.isUploadable() && album.json.downloadable === '0') {
 				$('#button_archive').hide();
 			} else {
 				$('#button_archive').show();

diff --git a/version.md b/version.md
@@ -1 +1 @@
-4.0.0
+4.0.1