app/soc/logic/models/request.py
changeset 562 1bf2beedda03
parent 535 9045b8888772
child 618 b2319f2633bc
equal deleted inserted replaced
561:4db464032b25 562:1bf2beedda03
    40 
    40 
    41   def getKeyValues(self, entity):
    41   def getKeyValues(self, entity):
    42     """See base.Logic.getKeyNameValues.
    42     """See base.Logic.getKeyNameValues.
    43     """
    43     """
    44 
    44 
    45     return [entity.role, entity.to.link_id, entity.requester.link_id]
    45     return [entity.role, entity.scope.link_id, entity.link_id]
    46 
    46 
    47   def getKeyValuesFromFields(self, fields):
    47   def getKeyValuesFromFields(self, fields):
    48     """See base.Logic.getKeyValuesFromFields.
    48     """See base.Logic.getKeyValuesFromFields.
    49     """
    49     """
    50 
    50 
    51     # TODO: "program_ln" might be needed here, since some Groups, such as
    51     return [fields['role'], fields['scope_path'], fields['link_id']]
    52     #   Organizations, are per-Program, per-Year
       
    53     return [fields['role'], fields['group_ln'], fields['user_ln']]
       
    54 
    52 
    55   def getKeyFieldNames(self):
    53   def getKeyFieldNames(self):
    56     """See base.Logic.getKeyFieldNames.
    54     """See base.Logic.getKeyFieldNames.
    57     """
    55     """
    58 
    56 
    59     return ['role', 'group_ln', 'user_ln']
    57     return ['role', 'scope_path', 'link_id']
    60 
    58 
    61 
    59 
    62 logic = Logic()
    60 logic = Logic()