bug 580399: display title of deleted plugin from retained state; more…

… clearly identify plugins in sandboxes
lmorchard · Jul 21, 2010 · 82751f5 · 82751f5
1 parent 1be9c61
commit 82751f5
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/application/views/macros/auditlogevents.html b/application/views/macros/auditlogevents.html
@@ -19,8 +19,13 @@
             {% endif %}
         </span>
 
-        {% if event.plugin.sandbox_profile_id %}
-            <a href="{{base_url}}profiles/{{event.plugin.sandbox_profile.screen_name|e}}/plugins/detail/{{event.plugin.pfs_id | urlencode | e}}">{{event.plugin.name | e}}</a>
+        {% if 'deleted' == event.action %}
+            <strike>{{event.old_state.meta.name}}</strike>
+            {% if event.old_state.meta.sandbox_profile_id %}
+                from sandbox
+            {% endif %}
+        {% elseif event.plugin.sandbox_profile_id %}
+            <a href="{{base_url}}profiles/{{event.plugin.sandbox_profile.screen_name|e}}/plugins/detail/{{event.plugin.pfs_id | urlencode | e}}">{{event.plugin.name | e}}</a> in sandbox
         {% else %}
             <a href="{{base_url}}plugins/detail/{{event.plugin.pfs_id | urlencode | e}}">{{event.plugin.name | e}}</a>
         {% endif %}
@@ -34,8 +39,6 @@
                 {% endif %}
             {% elseif 'copied_to_sandbox' == event.action %}
                 to <a class="actor" href="{{base_url}}profiles/{{event.details.sandbox_profile.screen_name|e}}/plugins/detail/{{event.plugin.pfs_id | urlencode | e}}">sandbox</a>
-            {% elseif 'requested_push' == event.action %}
-                from sandbox
             {% elseif 'remove_trusted' == event.action or 'add_trusted' == event.action %}
                 for <a class="actor" href="{{base_url}}profiles/{{event.details.profile.screen_name|e}}">{{event.details.profile.screen_name|e}}</a>
             {% else %}