issue2550831: Make the classic template query.edit page work.

More edits:

 1) Admin was unable to restore a deleted query but could retire it.
    Add 'restore' security permission to admin in security.py.
    This seems like it should be a standard perm.
 2) If a search you had in your "Your Queries" list was made private
    to somebody else, you lost the ability to drop it from your list.
    Modified the query.edit.html so that re-private and retired
    queries are listed at the bottom and you can uninstall them.

Ideally a re-privated query should just dissapear from your listing.
issue2550915 opened to track this.

Author: rouilj

roundup/security.py

@@ -126,7 +126,7 @@ def __init__(self, db):
         self.addRole(name="Anonymous", description="An anonymous user")
 
         # default permissions - Admin may do anything
-        for p in 'create edit retire view'.split():
+        for p in 'create edit restore retire view'.split():
             p = self.addPermission(name=p.title(),
                 description="User may %s everything"%p)
             self.addPermissionToRole('Admin', p)

share/roundup/templates/classic/html/query.edit.html

@@ -121,23 +121,41 @@
 </tr>
 
 <tr>
- <td colspan="5"><b i18n:translate="">Active retired queries</b></td>
+ <td colspan="5"><b i18n:translate="">Active retired/private queries</b></td>
 </tr>
-<tr tal:repeat="query request/user/queries">
+<tal:block tal:repeat="query request/user/queries">
+<tr>
  <tal:block condition="python:path('query/is_retired')">
  <td><a tal:attributes="href string:${query/klass}?${query/url}"
         tal:content="query/name">query</a></td>
  <tal:block tal:condition="python: not query.creator == uid">
     <td metal:use-macro="template/macros/include"> </td>
  </tal:block>
- <td colspan="3" i18n:translate="">[query is retired]</td>
+ <td colspan="2" tal:condition="python: not query.creator == uid" i18n:translate="">[query is retired]</td>
+ <td colspan="3" tal:condition="python:  query.creator == uid" i18n:translate="">[query is retired]</td>
  <td tal:condition="python:query.creator == uid">
   <input type="button" value="Restore" i18n:attributes="value"
   tal:attributes="onClick python:'''restore('%s')'''%query.id">
   </td>
+ <td colspan="1" tal:condition="python:not query.creator == uid" tal:content="query/creator" i18n:translate="">put query owner here</td>
  </tal:block>
 </tr>
-
+<tr>
+ <tal:block condition="python:path('query/private_for') and (not query.creator == uid)">
+ <td><a tal:attributes="href string:${query/klass}?${query/url}"
+        tal:content="query/name">query</a></td>
+ <tal:block tal:condition="python: not query.creator == uid">
+    <td metal:use-macro="template/macros/include"> </td>
+ </tal:block>
+ <td colspan="2" i18n:translate="">[query is private]</td>
+ <td tal:condition="python:query.creator == uid">
+  <input type="button" value="Restore" i18n:attributes="value"
+  tal:attributes="onClick python:'''restore('%s')'''%query.id">
+   </td>
+ <td colspan="1" tal:content="query/creator" i18n:translate="">put query owner here</td>
+ </tal:block>
+</tr>
+</tal:block>
 <tr><td colspan="5">
    <input type="hidden" name="@action" value="edit">
    <input type="hidden" name="@template" value="edit">