Merge lp:~bac/launchpad/bug-483607 into lp:launchpad

[Brad Crittenden]

Only show the editlocation link and map to the person whose page is being viewed.

[Brad Crittenden (bac)]

= Summary =

On a person index page for a person with no location data set the
editlocation map is still shown though it should not be.

== Proposed fix ==

Only show the editlocation map if the logged in user is the same as page
being viewed.

Also change it so that the location portlet is not shown at all if there
is no location data to display.

== Pre-implementation notes ==

None.

== Implementation details ==

As above.

== Tests ==

bin/test -vvm lp.registry -t person-views.txt -t xx-person-home.txt -t
personlocation.txt

== Demo and Q/A ==

As mark go to https://launchpad.dev/~bac and see no location data. Look
at other users and verify that the editlocation map is not shown and
that the location data only shows up if their location is set.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/registry/browser/tests/person-views.txt
  lib/lp/registry/templates/person-portlet-map.pt
  lib/lp/registry/stories/foaf/xx-person-home.txt
  lib/lp/registry/stories/location/personlocation.txt
  lib/lp/registry/browser/person.py

== Pylint notices ==

lib/lp/registry/browser/person.py
    117: [F0401] Unable to import 'lazr.delegates' (No module named
delegates)
    118: [F0401] Unable to import 'lazr.config' (No module named config)
    119: [F0401] Unable to import 'lazr.restful.interface' (No module
named restful)
    230: [F0401] Unable to import 'lazr.uri' (No module named uri)

[Graham Binns (gmb)]

review: Approve

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2009-11-17 02:56:38 +0000
+++ lib/lp/registry/browser/person.py	2009-11-17 16:39:11 +0000
@@ -3207,13 +3207,13 @@
         """Should the map portlet be displayed?
 
         The map portlet is displayed only if the person has no location
-        specified, or if the user has permission to view the person's
-        location.
+        specified (latitude), or if the user has permission to view the
+        person's location.
         """
-        if self.context.location is None:
+        if self.user == self.context:
             return True
         else:
-            return check_permission('launchpad.View', self.context.location)
+            return self.has_visible_location
 
 
 class TeamIndexView(PersonIndexView):

=== modified file 'lib/lp/registry/browser/tests/person-views.txt'
--- lib/lp/registry/browser/tests/person-views.txt	2009-10-09 21:01:34 +0000
+++ lib/lp/registry/browser/tests/person-views.txt	2009-11-17 16:39:11 +0000
@@ -226,7 +226,7 @@
     AssertionError: Can't generate the map for a person who hasn't set
                     a visible location.
 
-If the user set's his location, but does not make it visible, needs_gmap2
+If the user sets his location, but does not make it visible, needs_gmap2
 will still be False and the map_portlet_html property cannot be called.
 
     >>> login_person(sample_person)
@@ -271,6 +271,33 @@
     <script type="text/javascript">
       YUI().use('node', 'lp.mapping', function(Y) { ...
 
+The map portlet is shown if the user has not set his location and is
+viewing his own page.
+
+    >>> user = factory.makePerson()
+    >>> user.latitude is None
+    True
+    >>> login_person(user)
+    >>> person_view = create_initialized_view(
+    ...     user, '+index')
+    >>> person_view.should_show_map_portlet
+    True
+
+However another user will not be shown the portlet.
+
+    >>> login('[e-mail]')
+    >>> person_view = create_initialized_view(
+    ...     user, '+index')
+    >>> person_view.should_show_map_portlet
+    False
+
+If a user has a location set and it is visibible then the portlet is shown.
+
+    >>> person_view = create_initialized_view(
+    ...     sample_person, '+index')
+    >>> person_view.should_show_map_portlet
+    True
+
 
 == Things a person is working on ==
 
@@ -802,4 +829,3 @@
     >>> view = create_initialized_view(sample_person, "+index")
     >>> view.should_show_ppa_section
     False
-

=== modified file 'lib/lp/registry/stories/foaf/xx-person-home.txt'
--- lib/lp/registry/stories/foaf/xx-person-home.txt	2009-09-16 17:56:17 +0000
+++ lib/lp/registry/stories/foaf/xx-person-home.txt	2009-11-17 16:39:11 +0000
@@ -167,11 +167,18 @@
 
 The user's time zone is displayed next to their location details:
 
-    >>> browser.open('http://launchpad.dev/~name12')
+    >>> browser.open('http://launchpad.dev/~kamion')
     >>> print extract_text(
     ...     find_tag_by_id(browser.contents, 'portlet-map'))
     Location
-    Time zone: Australia/Perth
+    Time zone: Europe/London...
+
+If the user does not have location data set then the portlet will not
+be shown.
+
+    >>> browser.open('http://launchpad.dev/~bac')
+    >>> print extract_text(
+    ...     find_tag_by_id(browser.contents, 'portlet-map'))
 
 Teams don't have a time zone field.
 

=== modified file 'lib/lp/registry/stories/location/personlocation.txt'
--- lib/lp/registry/stories/location/personlocation.txt	2009-11-15 01:05:49 +0000
+++ lib/lp/registry/stories/location/personlocation.txt	2009-11-17 16:39:11 +0000
@@ -9,13 +9,12 @@
     ...                          latitude=None, longitude=None)
     >>> logout()
 
-Any person can see another person's time zone.
+Any person can see another person's time zone if their is also
+location data set, otherwise the location portlet does not show up.
 
     >>> anon_browser.open('http://launchpad.dev/~zzz')
     >>> print extract_text(
     ...     find_tag_by_id(anon_browser.contents, 'portlet-map'))
-    Location
-    Time zone: Africa/Maseru
 
 If a person has a location, there is a little map portlet in their
 profile page. We can't test all the google javascript, but we can make sure

=== modified file 'lib/lp/registry/templates/person-portlet-map.pt'
--- lib/lp/registry/templates/person-portlet-map.pt	2009-08-21 14:59:17 +0000
+++ lib/lp/registry/templates/person-portlet-map.pt	2009-11-17 16:39:11 +0000
@@ -7,14 +7,15 @@
 <div class="portlet" id="portlet-map"
      tal:define="overview_menu context/menu:overview">
 
-  <h2>Location</h2>
-
-  <div tal:condition="context/time_zone">
-    <strong>Time zone:</strong>
-    <span tal:replace="context/time_zone">UTC</span>
-  </div>
-
   <tal:show-map condition="view/should_show_map_portlet">
+
+    <h2>Location</h2>
+
+    <div tal:condition="context/time_zone">
+      <strong>Time zone:</strong>
+      <span tal:replace="context/time_zone">UTC</span>
+    </div>
+
     <div style="width: 400px;" tal:condition="context/latitude">
       <div id="person_map_actions"
         style="position:relative; z-index: 9999;
@@ -29,12 +30,11 @@
     </div>
 
     <tal:comment condition="nothing">
-      When a person's location is unset we can be sure any user will have
-      permission to set it, so we don't need to check that the link is enabled.
+      Only the user can see the editlocation image and link.
     </tal:comment>
     <a tal:condition="not: context/latitude"
        tal:attributes="href overview_menu/editlocation/target"
-      ><img src="/+icing/portlet-map-unknown.png" />
+       ><img src="/+icing/portlet-map-unknown.png" />
     </a>
   </tal:show-map>