Merge branch 'stable' into develop

Changelog.md

@@ -122,6 +122,15 @@ Contributions are very welcome, the hard work is done!
 * Check for collapsible posts after images in posts have loaded [#6671](https://github.com/diaspora/diaspora/pull/6671)
 * Add reason for post report to email sent to admins [#6679](https://github.com/diaspora/diaspora/pull/6679)
 
+# 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

app/assets/javascripts/app/pages/contacts.js

@@ -66,6 +66,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();
   },
 

spec/javascripts/app/pages/contacts_spec.js

@@ -87,6 +87,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() {