aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authormistic100 <mistic@piwigo.org>2013-07-14 16:43:22 +0000
committermistic100 <mistic@piwigo.org>2013-07-14 16:43:22 +0000
commit97cc62128f425938227af3a6d21c5e70278e3eca (patch)
tree01c6060cb24a3565a358c0043639ee2e17a2aa0d /admin
parentb4d9a99c582024239715426844148051943f2ce4 (diff)
bug:2944 Performance issues when creating an album
git-svn-id: http://piwigo.org/svn/trunk@23944 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/include/photos_add_direct_prepare.inc.php17
-rw-r--r--admin/themes/default/template/include/add_album.inc.tpl109
2 files changed, 50 insertions, 76 deletions
diff --git a/admin/include/photos_add_direct_prepare.inc.php b/admin/include/photos_add_direct_prepare.inc.php
index 9c4ede9f3..4f5f61187 100644
--- a/admin/include/photos_add_direct_prepare.inc.php
+++ b/admin/include/photos_add_direct_prepare.inc.php
@@ -160,12 +160,9 @@ $template->assign(
// we need to know the category in which the last photo was added
$selected_category = array();
-$selected_parent = array();
$query = '
-SELECT
- category_id,
- id_uppercat
+SELECT category_id
FROM '.IMAGES_TABLE.' AS i
JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON image_id = i.id
JOIN '.CATEGORIES_TABLE.' AS c ON category_id = c.id
@@ -178,11 +175,6 @@ if (pwg_db_num_rows($result) > 0)
$row = pwg_db_fetch_assoc($result);
$selected_category = array($row['category_id']);
-
- if (!empty($row['id_uppercat']))
- {
- $selected_parent = array($row['id_uppercat']);
- }
}
// existing album
@@ -197,13 +189,6 @@ display_select_cat_wrapper(
'category_options'
);
-// new category
-display_select_cat_wrapper(
- $query,
- $selected_parent,
- 'category_parent_options'
- );
-
// image level options
$selected_level = isset($_POST['level']) ? $_POST['level'] : 0;
diff --git a/admin/themes/default/template/include/add_album.inc.tpl b/admin/themes/default/template/include/add_album.inc.tpl
index 1fe8cea21..d950ad5ce 100644
--- a/admin/themes/default/template/include/add_album.inc.tpl
+++ b/admin/themes/default/template/include/add_album.inc.tpl
@@ -1,81 +1,67 @@
{footer_script}{literal}
jQuery(document).ready(function(){
- function fillCategoryListbox(selectId, selectedValue) {
- jQuery.getJSON(
- "ws.php?format=json&method=pwg.categories.getList",
- {
- recursive: true,
- fullname: true,
- format: "json",
- },
- function(data) {
- jQuery.each(
- data.result.categories,
- function(i,category) {
- var selected = null;
- if (category.id == selectedValue) {
- selected = "selected";
- }
-
- jQuery("<option/>")
- .attr("value", category.id)
- .attr("selected", selected)
- .text(category.name)
- .appendTo("#"+selectId)
- ;
- }
- );
- }
- );
- }
-
jQuery(".addAlbumOpen").colorbox({
- inline:true,
- href:"#addAlbumForm",
- onComplete:function(){
+ inline: true,
+ href: "#addAlbumForm",
+ onComplete: function() {
jQuery("input[name=category_name]").focus();
+
+ jQuery("#category_parent").html('<option value="0">------------</option>')
+ .append(jQuery("#albumSelect").html())
+ .val(jQuery("#albumSelect").val());
}
});
- jQuery("#addAlbumForm form").submit(function(){
+ jQuery("#addAlbumForm form").submit(function() {
jQuery("#categoryNameError").text("");
+
+ var parent_id = jQuery("select[name=category_parent] option:selected").val(),
+ name = jQuery("input[name=category_name]").val();
jQuery.ajax({
- url: "ws.php?format=json&method=pwg.categories.add",
+ url: "ws.php",
+ dataType: 'json',
data: {
- parent: jQuery("select[name=category_parent] option:selected").val(),
- name: jQuery("input[name=category_name]").val(),
+ format: 'json',
+ method: 'pwg.categories.add',
+ parent: parent_id,
+ name: name
},
beforeSend: function() {
jQuery("#albumCreationLoading").show();
},
- success:function(html) {
+ success: function(data) {
jQuery("#albumCreationLoading").hide();
-
- var newAlbum = jQuery.parseJSON(html).result.id;
jQuery(".addAlbumOpen").colorbox.close();
- jQuery("#albumSelect").find("option").remove();
- fillCategoryListbox("albumSelect", newAlbum);
-
- /* we refresh the album creation form, in case the user wants to create another album */
- jQuery("#category_parent").find("option").remove();
-
- jQuery("<option/>")
- .attr("value", 0)
- .text("------------")
- .appendTo("#category_parent")
- ;
-
- fillCategoryListbox("category_parent", newAlbum);
+ var newAlbum = data.result.id,
+ newAlbum_name = '';
+
+ if (parent_id!=0) {
+ newAlbum_name = jQuery("#category_parent").find("option[value="+ parent_id +"]").text() +' / ';
+ }
+ newAlbum_name+= name;
+
+ var new_option = jQuery("<option/>")
+ .attr("value", newAlbum)
+ .attr("selected", "selected")
+ .text(newAlbum_name);
+
+ jQuery("#albumSelect").find("option").removeAttr('selected');
+
+ if (parent_id==0) {
+ jQuery("#albumSelect").append(new_option);
+ }
+ else {
+ jQuery("#albumSelect").find("option[value="+ parent_id +"]").after(new_option);
+ }
jQuery("#addAlbumForm form input[name=category_name]").val('');
-
jQuery("#albumSelection").show();
return true;
},
- error:function(XMLHttpRequest, textStatus, errorThrows) {
+ error: function(XMLHttpRequest, textStatus, errorThrows) {
jQuery("#albumCreationLoading").hide();
jQuery("#categoryNameError").text(errorThrows).css("color", "red");
}
@@ -90,13 +76,16 @@ jQuery(document).ready(function(){
<div id="addAlbumForm" style="text-align:left;padding:1em;">
<form>
{'Parent album'|@translate}<br>
- <select id ="category_parent" name="category_parent">
- <option value="0">------------</option>
- {html_options options=$category_parent_options selected=$category_parent_options_selected}
+ <select id="category_parent" name="category_parent">
</select>
-
- <br><br>{'Album name'|@translate}<br><input name="category_name" type="text" maxlength="255"> <span id="categoryNameError"></span>
- <br><br><br><input type="submit" value="{'Create'|@translate}"> <span id="albumCreationLoading" style="display:none"><img src="themes/default/images/ajax-loader-small.gif"></span>
+ <br><br>
+
+ {'Album name'|@translate}<br>
+ <input name="category_name" type="text" maxlength="255"> <span id="categoryNameError"></span>
+ <br><br><br>
+
+ <input type="submit" value="{'Create'|@translate}">
+ <span id="albumCreationLoading" style="display:none"><img src="themes/default/images/ajax-loader-small.gif"></span>
</form>
</div>
</div>