Changeset 624

Timestamp:

10/21/08 19:02:34 (5 years ago)

Author:

aculapov

Message:

• used the skip attribute in the fields list for hiding ticket fields

Location:

trunk/plugins/tickettypedsystem/ticketsystem

Files:

• tickettypes/parentticket.py (modified) (1 diff)
• tickettypes/uxhandler.py (modified) (1 diff)
• web_ui.py (modified) (2 diffs)

trunk/plugins/tickettypedsystem/ticketsystem/tickettypes/parentticket.py

@@ -23 +23 @@
         system = TypedTicketSystem(self.env)
         new_data = {'style' : True, 
-                    'ticket_types': system.get_ticket_types(),
-                    'hide_fields': {},
-                    'show_fields': {},}
-        for type in new_data['ticket_types'] :
-            new_data['hide_fields'][type] = system.get_filtered_fields(type)
-            new_data['show_fields'][type] = [val['name'] 
-                                    for val in system.get_ticket_fields(type)]
+                    'ticket_types': system.get_ticket_types(),}
         
-        new_data['show_fields']['all'] =  [val['name'] 
+        type = data['ticket']['type']
+        hide_fields = system.get_filtered_fields(type)
+        show_fields = [val['name'] for val in system.get_ticket_fields(type)]
+        for field in data['fields'] :
+            if field['name'] in hide_fields :
+                field['skip'] = True
+            if field['name'] in show_fields :
+                field['skip'] = False
+                
+        new_data['fields'] = data['fields']
+        
+        new_data['all_fields'] =  [val['name'] 
                                     for val in system.get_ticket_fields()]
         

trunk/plugins/tickettypedsystem/ticketsystem/tickettypes/uxhandler.py

@@ -69 +69 @@
                 req.redirect(req.chrome['links']['up'][0]['href'])
         
-        return "ticket.html", data, content_type
+        return None, data, None
 
     # ITicketFieldProvider methods

trunk/plugins/tickettypedsystem/ticketsystem/web_ui.py

@@ -66 +66 @@
     def post_process_request(self, req, template, data, content_type):        
         if template in ["ticket.html" ]:
+            new_template = None    
             if not data.has_key('fields_key') :
                 data['fields_dict'] ={}
@@ -88 +89 @@
                     page = render_handle.handle_request(req, data, content_type)
                     if page :
-                        return page
+                        new_template, new_data, new_content_type = page
+                        if new_template and new_data and new_content_type :
+                            return new_template, new_data, new_content_type
+                        if new_data :
+                            data = new_data
+                        if new_content_type :
+                            content_type = new_content_type
+        
+            # hook the new template
+            if new_template :
+                data['ticket_template'] = new_template
+            else :
+                data['ticket_template'] = self.env.config.get('ticket-system', 
+                                                              'ticket.template', 
+                                                              'ticket.html')
+            return "typedticket.html", data, content_type
+        
         return template, data, content_type