Operation on unwanted places

[ntmlod]

The plugin has a little tendency to work on other tables, for example the history of a wiki page where the version numbers are replaced by dropdown menu with code versions.

Perhaps the best way to handle this is to limit to /query & /report href pages and tables generated with [[TicketQuery()]].

[Jun Omae]

Root cause is the following expression in filter_stream().

        if filename in ('query.html', 'report_view.html') and \
                'TICKET_ADMIN' in req.perm or \
                'TICKET_GRID_MODIFY' in req.perm:

It should be:

        if filename in ('query.html', 'report_view.html') and \
                ('TICKET_ADMIN' in req.perm or 'TICKET_GRID_MODIFY' in req.perm):

However, it would be simplified to group TICKET_GRID_MODIFY in TICKET_ADMIN.

gridmodifyplugin/trunk/gridmod/web_ui.py

@@ -34 +34 @@
 
     def get_permission_actions(self):
         yield 'TICKET_GRID_MODIFY'
+        yield 'TICKET_ADMIN', ['TICKET_GRID_MODIFY']
 
     # ITemplateProvider methods
 
@@ -51 +52 @@
 
     def process_request(self, req):
         try:
-            if 'TICKET_ADMIN' in req.perm or 'TICKET_GRID_MODIFY' in req.perm:
+            if 'TICKET_GRID_MODIFY' in req.perm:
 
                 id = as_int(req.args.get('ticket'), None)
                 ticket = Ticket(self.env, id)
@@ -122 +123 @@
         # tag values. JQuery then uses this information to update the
         # relevant fields on the page.
         if filename in ('query.html', 'report_view.html') and \
-                'TICKET_ADMIN' in req.perm or \
                 'TICKET_GRID_MODIFY' in req.perm:
             add_script(req, 'gridmod/gridmod.js')
             div = html.div(id='table_inits_holder', style='display:none;')

Could you please try it?

[Jun Omae]

Also, the plugin doesn't work on the table generated by TicketQuery macro.

[Ryan J Ollos]

Thanks, regression in [16202#file3].

[ntmlod]

gridmodifyplugin/trunk/gridmod/web_ui.py

@@ -33 +33 @@
     # IPermissionRequestor methods
 
     def get_permission_actions(self):
-        yield 'TICKET_GRID_MODIFY'
+        yield 'TICKET_ADMIN', ['TICKET_GRID_MODIFY']
 
     # ITemplateProvider methods
 
@@ -51 +51 @@
 
     def process_request(self, req):
         try:
-            if 'TICKET_ADMIN' in req.perm or 'TICKET_GRID_MODIFY' in req.perm:
+            if 'TICKET_GRID_MODIFY' in req.perm:
 
                 id = as_int(req.args.get('ticket'), None)
                 ticket = Ticket(self.env, id)
@@ -122 +122 @@
         # tag values. JQuery then uses this information to update the
         # relevant fields on the page.
         if filename in ('query.html', 'report_view.html') and \
-                'TICKET_ADMIN' in req.perm or \
                 'TICKET_GRID_MODIFY' in req.perm:
             add_script(req, 'gridmod/gridmod.js')
             div = html.div(id='table_inits_holder', style='display:none;')

The version history for wiki pages has been restored.
I think I encountered the problem in another page but I can't remember which. Probably this fix solves it.

Replying to Jun Omae:

Also, the plugin doesn't work on the table generated by TicketQuery macro.

I didn't try to change a field trough this but I see dropdown menus fro TicketQuery tables

[ntmlod]

After review TICKET_GRID_MODIFY is no longer in the permissions list, the first change shouldn't it be:

gridmod/web_ui.py

@@ -33 +33 @@
     # IPermissionRequestor methods
 
     def get_permission_actions(self):
-       yield 'TICKET_GRID_MODIFY'
+       return [('TICKET_ADMIN', ['TICKET_GRID_MODIFY']), 'TICKET_GRID_MODIFY']
 
     # ITemplateProvider methods

[Jun Omae]

Wired. TICKET_GRID_MODIFY is definitely listed.

[Jun Omae]

Replying to Jun Omae:

Also, the plugin doesn't work on the table generated by TicketQuery macro.

I didn't try to change a field trough this but I see dropdown menus fro TicketQuery tables

No. That is unintentional behavior which is probably introduced in [16202].

[ntmlod]

Replying to Jun Omae:

Replying to Jun Omae:

Also, the plugin doesn't work on the table generated by TicketQuery macro.

I didn't try to change a field trough this but I see dropdown menus fro TicketQuery tables

No. That is unintentional behavior which is probably introduced in [16202].

You're right, it's no longer the case now.

Back to permission issue, my screenshot is not very good but you can see the permission TICKET_GRID_MODIFY is grey and with some heed not in the list from the dropdown menu.

[Ryan J Ollos]

In 16953:

GridModify 1.0.0dev: TICKET_ADMIN grants TICKET_GRID_MODIFY

This fixes a regression in r16202.

Refs #13322.