From a9a045eefddcf6a0c1d759cf3b80c91832514ee7 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Fri, 28 Dec 2018 14:32:11 +0000 Subject: [PATCH] Fix wizard deleting values from topic create --- app/public/static/package_create.js | 43 ++++++++++++------------- app/templates/packages/create_edit.html | 2 +- 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/app/public/static/package_create.js b/app/public/static/package_create.js index ac7b79f..0dc363e 100644 --- a/app/public/static/package_create.js +++ b/app/public/static/package_create.js @@ -20,41 +20,38 @@ $(function() { $(".pkg_wiz_2").show() $(".pkg_repo").hide() - function setSpecial(id, value) { + function setField(id, value) { if (value != "") { var ele = $(id); ele.val(value); - ele.trigger("change") + ele.trigger("change"); } } performTask("/tasks/getmeta/new/?url=" + encodeURI(repoURL)).then(function(result) { - $("#name").val(result.name) - setSpecial("#provides_str", result.provides) - $("#title").val(result.title) - $("#repo").val(result.repo || repoURL) - $("#issueTracker").val(result.issueTracker) - $("#desc").val(result.description) - $("#shortDesc").val(result.short_description) - setSpecial("#harddep_str", result.depends) - setSpecial("#softdep_str", result.optional_depends) - $("#shortDesc").val(result.short_description) - if (result.forumId) { - $("#forums").val(result.forumId) - } - + setField("#name", result.name); + setField("#provides_str", result.provides); + setField("#title", result.title); + setField("#repo", result.repo || repoURL); + setField("#issueTracker", result.issueTracker); + setField("#desc", result.description); + setField("#shortDesc", result.short_description); + setField("#harddep_str", result.depends); + setField("#softdep_str", result.optional_depends); + setField("#shortDesc", result.short_description); + setField("#forums", result.forumId); if (result.type && result.type.length > 2) { - $("#type").val(result.type) + $("#type").val(result.type); } - finish() + finish(); }).catch(function(e) { - alert(e) - $(".pkg_wiz_1").show() - $(".pkg_wiz_2").hide() - $(".pkg_repo").show() + alert(e); + $(".pkg_wiz_1").show(); + $(".pkg_wiz_2").hide(); + $(".pkg_repo").show(); // finish() - }) + }); } else { finish() } diff --git a/app/templates/packages/create_edit.html b/app/templates/packages/create_edit.html index 4d79e7b..0953ce5 100644 --- a/app/templates/packages/create_edit.html +++ b/app/templates/packages/create_edit.html @@ -14,7 +14,7 @@ {% if enable_wizard %} - +