Merge lp:~wgrant/launchpad/sharing-icon-fix into lp:launchpad

[William Grant]

Fix +sharing permission picker creation to unhide the right edit icon.

The grantee table JS on +sharing was always unhiding the first edit icon in each row, even when activating a permission other than the first. Fix it to always show the right one.

I also fixed jsbuild to rebuild the LP JS without having to clean first.

[Steve Kowalik (stevenk)]

review: Approve (code)

=== modified file 'Makefile'
--- Makefile	2013-04-18 04:33:16 +0000
+++ Makefile	2013-04-19 06:14:27 +0000
@@ -173,7 +173,7 @@
 	ln -sfn $(YUI_DEFAULT) $@
 
 $(LP_JS_BUILD): | $(JS_BUILD_DIR)
-	mkdir $@
+	-mkdir $@
 	for jsdir in lib/lp/*/javascript; do \
 		app=$$(echo $$jsdir | sed -e 's,lib/lp/\(.*\)/javascript,\1,'); \
 		cp -a $$jsdir $@/$$app; \
@@ -489,4 +489,4 @@
 	launchpad.pot pagetests pull_branches pydoctor realclean	\
 	reload-apache run run-testapp runner scan_branches schema	\
 	sprite_css sprite_image start stop sync_branches TAGS tags	\
-	test_build test_inplace zcmldocs
+	test_build test_inplace zcmldocs $(LP_JS_BUILD)

=== modified file 'lib/lp/registry/javascript/sharing/granteetable.js'
--- lib/lp/registry/javascript/sharing/granteetable.js	2013-04-09 05:05:39 +0000
+++ lib/lp/registry/javascript/sharing/granteetable.js	2013-04-19 06:14:27 +0000
@@ -245,12 +245,11 @@
 
         var id = 'permission-'+grantee.name;
         var grantee_row = this.get('grantee_table').one('[id="' + id + '"]');
-        var permission_node = grantee_row.one('[id="td-' + id + '"]');
-        var contentBox = permission_node.one(
+        var contentBox = grantee_row.one(
             '[id="' + policy + '-' + id + '"]');
         var value_location = contentBox.one('.value');
         var editable = LP.cache.has_edit_permission;
-        var editicon = permission_node.one('a.editicon');
+        var editicon = contentBox.one('a.editicon');
         if (editable) {
             editicon.removeClass('hidden');
         }

=== modified file 'lib/lp/registry/javascript/sharing/tests/test_granteetable.js'
--- lib/lp/registry/javascript/sharing/tests/test_granteetable.js	2013-03-20 03:41:40 +0000
+++ lib/lp/registry/javascript/sharing/tests/test_granteetable.js	2013-04-19 06:14:27 +0000
@@ -84,8 +84,23 @@
                 "Grantee table failed to be instantiated");
         },
 
+        // Write mode unhides the edit icons.
+        test_writable: function() {
+            window.LP.cache.has_edit_permission = true;
+            this.grantee_table = this._create_Widget({
+                write_enabled: true
+            });
+            this.grantee_table.render();
+            Y.all('#grantee-table ' +
+                  '.sprite.add, .sprite.edit, .sprite.remove a')
+                .each(function(link) {
+                    Y.Assert.isFalse(link.hasClass('hidden'));
+            });
+        },
+
         // Read only mode disables the correct things.
         test_readonly: function() {
+            window.LP.cache.has_edit_permission = true;
             this.grantee_table = this._create_Widget({
                 write_enabled: false
             });