Show a random image from an album instead of the album image

[Sone.git] / src / main / resources / templates / imageBrowser.html

diff --git a/src/main/resources/templates/imageBrowser.html b/src/main/resources/templates/imageBrowser.html
index da8d032..c49c633 100644 (file)
--- a/src/main/resources/templates/imageBrowser.html
+++ b/src/main/resources/templates/imageBrowser.html
@@ -116,13 +116,20 @@
                                                title = $(":input[name='title']:enabled", this.form).val();
                                                description = $(":input[name='description']:enabled", this.form).val();
                                                ajaxGet("editImage.ajax", { "formPassword": getFormPassword(), "image": imageId, "title": title, "description": description }, function(data) {
-                                                       if (data && data.success) {
-                                                               getImage(data.imageId).find(".image-title").text(data.title);
-                                                               getImage(data.imageId).find(".image-description").html(data.parsedDescription);
-                                                               getImage(data.imageId).find(":input[name='title']").attr("defaultValue", title);
-                                                               getImage(data.imageId).find(":input[name='description']").attr("defaultValue", data.description);
+                            var imageElement = getImage(data.imageId);
+                            var imageTitleInput = imageElement.find(":input[name='title']");
+                            var imageDescriptionInput = imageElement.find(":input[name='description']");
+                            if (data && data.success) {
+                                                               imageElement.find(".image-title").text(data.title);
+                                                               imageElement.find(".image-description").html(data.parsedDescription);
+                                                               imageTitleInput.attr("defaultValue", data.title);
+                                                               imageDescriptionInput.attr("defaultValue", data.description);
                                                                cancelImageEditing();
-                                                       }
+                                                       } else if (data && !data.success) {
+                                                               imageTitleInput.attr("value", imageTitleInput.attr("defaultValue"));
+                                imageDescriptionInput.attr("value", imageDescriptionInput.attr("defaultValue"));
+                                cancelImageEditing();
+                            }
                                                });
                                                return false;
                                        });
@@ -232,13 +239,20 @@
                                                title = $(":input[name='title']:enabled", this.form).val();
                                                description = $(":input[name='description']:enabled", this.form).val();
                                                ajaxGet("editAlbum.ajax", { "formPassword": getFormPassword(), "album": albumId, "title": title, "description": description }, function(data) {
-                                                       if (data && data.success) {
-                                                               getAlbum(data.albumId).find(".album-title").text(data.title);
-                                                               getAlbum(data.albumId).find(".album-description").text(data.description);
-                                                               getAlbum(data.albumId).find(":input[name='title']").attr("defaultValue", title);
-                                                               getAlbum(data.albumId).find(":input[name='description']").attr("defaultValue", description);
-                                                               cancelAlbumEditing();
-                                                       }
+                                                       if (data) {
+                                var albumTitleField = getAlbum(data.albumId).find(".album-title");
+                                var albumDescriptionField = getAlbum(data.albumId).find(".album-description");
+                                if (data.success) {
+                                    albumTitleField.text(data.title);
+                                    albumDescriptionField.text(data.description);
+                                    getAlbum(data.albumId).find(":input[name='title']").attr("defaultValue", title);
+                                    getAlbum(data.albumId).find(":input[name='description']").attr("defaultValue", description);
+                                } else {
+                                    albumTitleField.attr("value", albumTitleField.attr("defaultValue"));
+                                    albumDescriptionField.attr("value", albumDescriptionField.attr("defaultValue"));
+                                }
+                                cancelAlbumEditing();
+                            }
                                                });
                                                return false;
                                        });
@@ -609,7 +623,7 @@
                                                <%ifnull album.albumImage>
                                                        <img src="images/unknown-image-0.png" width="333" height="250" alt="<% album.title|html> (<%album.sone.niceName|html>)" title="<% album.title|html> (<%album.sone.niceName|html>)" style="position: relative; top: 0px; left: -41px;" />
                                                <%else><!-- TODO -->
-                                                       <% album.albumImage|image-link max-width==250 max-height==250 mode==enlarge title=album.title>
+                                                       <% album.randomImage|image-link max-width==250 max-height==250 mode==enlarge title=album.title>
                                                <%/if>
                                        </a>
                                </div>