From 7fe7287928d4ae985ba4044b394c227a97fbebf6 Mon Sep 17 00:00:00 2001 From: Saritha Date: Wed, 25 Nov 2015 12:30:55 +0530 Subject: [PATCH 1/2] Fix for Empty input field when editing aspect name Fix #6548 --- app/assets/javascripts/app/pages/contacts.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/javascripts/app/pages/contacts.js b/app/assets/javascripts/app/pages/contacts.js index 0cce5ef15..96cfb60f6 100644 --- a/app/assets/javascripts/app/pages/contacts.js +++ b/app/assets/javascripts/app/pages/contacts.js @@ -63,6 +63,8 @@ app.pages.Contacts = Backbone.View.extend({ showAspectNameForm: function() { $(".header > h3").hide(); + var aspectName = $.trim($(".header h3 #aspect_name").text()); + $("#aspect_name_form #aspect_name").val(aspectName); $(".header > #aspect_name_form").show(); }, From 02b330de70c432262d810bd9a9c45ed5fe34b8b6 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 11 Feb 2016 10:34:55 +0100 Subject: [PATCH 2/2] Add jasmine test for aspect name form on contacts page closes #6706 --- Changelog.md | 9 +++++++++ spec/javascripts/app/pages/contacts_spec.js | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/Changelog.md b/Changelog.md index bb6c65421..ece019c6c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,12 @@ +# 0.5.8.0 + +## Refactor + +## Bug fixes +* Fix empty name field when editing aspect names [#6548](https://github.com/diaspora/diaspora/issues/6548) + +## Features + # 0.5.7.0 ## Refactor diff --git a/spec/javascripts/app/pages/contacts_spec.js b/spec/javascripts/app/pages/contacts_spec.js index e62bce96a..052db4ac3 100644 --- a/spec/javascripts/app/pages/contacts_spec.js +++ b/spec/javascripts/app/pages/contacts_spec.js @@ -84,6 +84,13 @@ describe("app.pages.Contacts", function(){ this.button.trigger('click'); expect($('.header > h3').css('display')).toBe('none'); }); + + it("sets the current aspect name as the default value in the form", function() { + $(".header > h3 #aspect_name").text("My awesome unicorn aspect"); + expect($("#aspect_name_form input[name='aspect[name]']").val()).not.toBe("My awesome unicorn aspect"); + this.button.trigger("click"); + expect($("#aspect_name_form input[name='aspect[name]']").val()).toBe("My awesome unicorn aspect"); + }); }); context('search contact list', function() {