Changeset 10232


Ignore:
Timestamp:
27 May 2013, 06:51:17 (11 years ago)
Author:
Henrik Bettermann
Message:

Rename property attribute to avoid confusion with workflow state.

Remove redundant property attributes.

Location:
main/waeup.kofa/trunk/src/waeup/kofa
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt

    r9984 r10232  
    6060      <td tal:content ="value/category">CATEGORY</td>
    6161      <td tal:content ="value/display_item">ITEM</td>
    62       <td tal:content ="value/state">STATE</td>
     62      <td tal:content ="value/p_state_title">STATE</td>
    6363    </tr>
    6464  </tbody>

  • main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicanteditpage.pt

    r9984 r10232  
    110110      <td tal:content ="cl/category">CATEGORY</td>
    111111      <td tal:content ="cl/display_item">ITEM</td>
    112       <td tal:content ="cl/state">STATE</td>
     112      <td tal:content ="cl/p_state_title">STATE</td>
    113113      </tr>
    114114    </tbody>

  • main/waeup.kofa/trunk/src/waeup/kofa/payments/payment.py

    r9987 r10232  
    5757
    5858    @property
    59     def state(self):
     59    def p_state_title(self):
    6060        return payment_states.getTermByToken(self.p_state).title
    6161

  • main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/paymentsmanagepage.pt

    r10080 r10232  
    3232      <td tal:content ="cl/amount_auth">AMOUNT</td>
    3333      <td tal:content ="cl/p_session">SESSION</td>
    34       <td tal:content ="cl/state">STATE</td>
     34      <td tal:content ="cl/p_state_title">STATE</td>
    3535      </tr>
    3636    </tbody>

  • main/waeup.kofa/trunk/src/waeup/kofa/students/export.py

    r10017 r10232  
    294294            IStudentOnlinePayment, exclude_attribs=False,
    295295            omit=['display_item']))) + (
    296             'student_id','student_state','current_session')
     296            'student_id','state','current_session')
    297297
    298298    #: The title under which this exporter will be displayed
    … …  
    307307        if context is not None:
    308308            student = context.student
    309             if name in ['student_id'] and student is not None:
     309            if name in ['student_id','state',
     310                        'current_session'] and student is not None:
    310311                value = getattr(student, name, None)
    311312        return super(

  • main/waeup.kofa/trunk/src/waeup/kofa/students/payments.py

    r10030 r10232  
    6363        try:
    6464            return self.__parent__.__parent__
    65         except AttributeError:
    66             return None
    67 
    68     @property
    69     def student_state(self):
    70         try:
    71             return self.student.state
    72         except AttributeError:
    73             return None
    74 
    75     @property
    76     def current_session(self):
    77         try:
    78             return self.student.current_session
    7965        except AttributeError:
    8066            return None

  • main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_export.py

    r9983 r10232  
    631631            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    632632            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    633             'r_code,r_desc,student_id,student_state,current_session\r\n'
     633            'r_code,r_desc,student_id,state,current_session\r\n'
    634634
    635635            ',0.0,2012-04-01 13:12:01,schoolfee,1,,,,,unpaid,,0.0,,,,,\r\n'
    … …  
    649649            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    650650            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    651             'r_code,r_desc,student_id,student_state,current_session\r\n'
     651            'r_code,r_desc,student_id,state,current_session\r\n'
    652652
    653653            '666,0.0,2012-04-01 13:12:01,schoolfee,1,my-id,'
    … …  
    668668            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    669669            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    670             'r_code,r_desc,student_id,student_state,current_session\r\n'
     670            'r_code,r_desc,student_id,state,current_session\r\n'
    671671
    672672            '666,0.0,2012-04-01 13:12:01,schoolfee,1,my-id,'
    … …  
    687687            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    688688            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    689             'r_code,r_desc,student_id,student_state,current_session\r\n'
     689            'r_code,r_desc,student_id,state,current_session\r\n'
    690690
    691691            '666,0.0,2012-04-01 13:12:01,schoolfee,1,my-id,'
    … …  
    709709            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    710710            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    711             'r_code,r_desc,student_id,student_state,current_session\r\n'
     711            'r_code,r_desc,student_id,state,current_session\r\n'
    712712
    713713            '666,0.0,2012-04-01 13:12:01,schoolfee,1,my-id,'
Note: See TracChangeset for help on using the changeset viewer.