Changeset 4435

Show
Ignore:
Timestamp:
10/12/08 08:25:51 (1 month ago)
Author:
coling
Message:

Change interface definition to make it work with future changes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • clientsplugin/0.11/clients/milestonesummary.py

    r4370 r4435  
    2323  implements(IClientSummaryProvider) 
    2424 
    25   env = None 
    26   req = None 
     25  client = None 
    2726  debug = False 
    28   def __init__(self, env, req, debug = False): 
    29     self.env = env 
    30     self.req = req 
    31     self.debug = debug 
    3227 
    3328  def get_name(self): 
    …… 
    3732    return "Provide a summary of tickets within all milestones that have completion dates set and give summaries of a milestone" 
    3833 
    39   def get_summary(self, client, fromdate = None, todate = None): 
     34  def instance_options(): 
     35    return [] 
     36 
     37  def client_options(): 
     38    return [] 
     39 
     40  def init(self, instance, client): 
     41    self.client = client 
     42 
     43  def get_summary(self, req, fromdate = None, todate = None): 
    4044    def myformat_date(dte): 
    4145      if dte: 
    …… 
    6266      return 'No estimate available' 
    6367 
     68    client = self.client 
    6469    xml = etree.Element('clientsplugin') 
    6570 
    …… 
    111116            etree.SubElement(xmilestone, 'completed').text = myformat_date(completed) 
    112117          if mdescription: 
    113             xmilestone.append(etree.XML('<description>%s</description>' % wiki_to_html(extract_client_text(mdescription), self.env, self.req))) 
     118            xmilestone.append(etree.XML('<description>%s</description>' % wiki_to_html(extract_client_text(mdescription), self.env, req))) 
    114119          else: 
    115120            etree.SubElement(xmilestone, 'description').text = '' 
    …… 
    126131      etree.SubElement(ticket, 'id').text = str(tid) 
    127132      etree.SubElement(ticket, 'summary').text = summary 
    128       ticket.append(etree.XML('<description>%s</description>' % wiki_to_html(extract_client_text(description), self.env, self.req))) 
     133      ticket.append(etree.XML('<description>%s</description>' % wiki_to_html(extract_client_text(description), self.env, req))) 
    129134      etree.SubElement(ticket, 'status').text = status 
    130135      etree.SubElement(ticket, 'milestone').text = milestone 

  • clientsplugin/0.11/clients/summaryinterface.py

    r4370 r4435  
    33 
    44class IClientSummaryProvider(Interface): 
    5   """Extension point interface for components that their own way 
     5  """Extension point interface for components that define their own way 
    66  to summarise a given client. 
    77  """ 
    8  
    9   def __init__(env, req, debug = False): 
    10     """Constructor 
    11     """ 
    128 
    139  def get_name(): 
    …… 
    1915    """ 
    2016 
    21   def get_summary(client, fromdate = None, todate = None): 
     17  def instance_options(): 
     18    """Return a series of tupoles defining the option that can be set on this instance 
     19    """ 
     20 
     21  def client_options(): 
     22    """Return a series of tupoles defining the option that can be set on this client 
     23       for this specific instance. 
     24    """ 
     25 
     26  def init(instance, client): 
     27    """Initialise the summary for a specific instance and client combo 
     28    """ 
     29 
     30  def get_summary(req, fromdate = None, todate = None): 
    2231    """Get the summary. This must return an etree object 
    2332    """ 

  • clientsplugin/0.11/clients/ticketchanges.py

    r4370 r4435  
    2323  implements(IClientSummaryProvider) 
    2424 
    25   env = None 
    26   req = None 
     25  client = None 
    2726  debug = False 
    28   def __init__(self, env, req, debug = False): 
    29     self.env = env 
    30     self.req = req 
    31     self.debug = debug 
    3227 
    3328  def get_name(self): 
    …… 
    3732    return "Provide a summary of ticket changes since the last run" 
    3833 
    39   def get_summary(self, client, fromdate = None, todate = None): 
     34  def instance_options(): 
     35    return [] 
     36 
     37  def client_options(): 
     38    return [] 
     39 
     40  def init(self, instance, client): 
     41    self.client = client 
     42 
     43  def get_summary(self, req, fromdate = None, todate = None): 
    4044    def myformat_date(dte): 
    4145      if dte: 
    …… 
    6266      return 'No estimate available' 
    6367 
     68    client = self.client 
    6469    xml = etree.Element('clientsplugin') 
    6570 
    …… 
    130135        etree.SubElement(ticket, 'id').text = str(tid) 
    131136        etree.SubElement(ticket, 'summary').text = summary 
    132         ticket.append(etree.XML('<description>%s</description>' % wiki_to_html(extract_client_text(description), self.env, self.req))) 
     137        ticket.append(etree.XML('<description>%s</description>' % wiki_to_html(extract_client_text(description), self.env, req))) 
    133138        etree.SubElement(ticket, 'status').text = status 
    134139        etree.SubElement(ticket, 'resolution').text = resolution 
    …… 
    137142        changelog = etree.SubElement(ticket, 'changelog') 
    138143 
    139       detail = etree.XML('<detail>%s</detail>' % wiki_to_html(text, self.env, self.req)) 
     144      detail = etree.XML('<detail>%s</detail>' % wiki_to_html(text, self.env, req)) 
    140145      detail.set('field', cgfield) 
    141146      if oldvalue: 

  • clientsplugin/0.11/cron/send-client-email

    r4372 r4435  
    277277          if 'summary' == field: 
    278278            from clients.milestonesummary import ClientMilestoneSummary 
    279             summariser = ClientMilestoneSummary(self.env, self.req) 
     279            summariser = ClientMilestoneSummary(self.env) 
    280280          else: 
    281281            from clients.ticketchanges import ClientTicketChanges 
    282             summariser = ClientTicketChanges(self.env, self.req) 
    283  
    284           xml = summariser.get_summary(name, lastupdate, now) 
     282            summariser = ClientTicketChanges(self.env) 
     283 
     284          summariser.init("instancedummy", name) 
     285          xml = summariser.get_summary(self.req, lastupdate, now) 
    285286          if xml is None: 
    286287            continue