Changeset 2013


Ignore:
Timestamp:
12 Jul 2007, 16:12:23 (17 years ago)
Author:
Henrik Bettermann
Message:

see ticket #102

Location:
WAeUP_SRP/trunk
Files:
10 added
16 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/Widgets.py

    r2002 r2013  
    509509                                          'CertificateCourse',]}
    510510            widget_id = self.getWidgetId()
    511             value = datastructure[widget_id].upper()
     511            value = datastructure[widget_id]  #.upper()  is not necessary here because it's also done in waeup_document_create_do
    512512            err = 0
    513513            mapping = {}

  • WAeUP_SRP/trunk/__init__.py

    r1934 r2013  
    7676     ("ScratchCards",
    7777         ("ScratchCardBatch",
    78          "ScratchCardBatchesFolder",
    79          ),
    80      )
     78          "ScratchCardBatchesFolder",
     79         )
     80     ),
     81     ("Documents",
     82        ("DocumentsFolder",
     83         "WAeUPDocument",
     84        )
     85     ),       
    8186    )
    8287

  • WAeUP_SRP/trunk/profiles/default/layouts/department.xml

    r1449 r2013  
    3030 </widget>
    3131 <widget name="code" meta_type="WAeUPId Widget">
    32   <property name="title">Department ID</property>
     32  <property name="title">Department Id</property>
    3333  <property name="fields">
    3434   <element value="code"/>
    3535  </property>
    3636  <property name="is_required">True</property>
    37   <property name="label">Department ID</property>
    38   <property name="label_edit">Department ID</property>
     37  <property name="label">Department Id</property>
     38  <property name="label_edit">Department Id</property>
    3939  <property name="readonly_layout_modes"/>
    4040  <property name="hidden_layout_modes">

  • WAeUP_SRP/trunk/profiles/default/layouts/faculty.xml

    r1449 r2013  
    4141 </widget>
    4242 <widget name="code" meta_type="WAeUPId Widget">
    43   <property name="title">Faculty ID</property>
     43  <property name="title">Faculty Id</property>
    4444  <property name="fields">
    4545   <element value="code"/>
    4646  </property>
    4747  <property name="is_required">True</property>
    48   <property name="label">Faculty ID</property>
    49   <property name="label_edit">Faculty ID</property>
     48  <property name="label">Faculty Id</property>
     49  <property name="label_edit">Faculty Id</property>
    5050  <property name="readonly_layout_modes">
    5151   <element value="edit"/>

  • WAeUP_SRP/trunk/profiles/default/layouts/waeup_common.xml

    r1449 r2013  
    1010 <widget name="Title" meta_type="String Widget">
    1111  <property name="fields">
    12    <element value="Title"/>
     12   <element value="title"/>
    1313  </property>
    1414  <property name="is_required">False</property>
    … …  
    1616  <property name="label_edit">Title</property>
    1717  <property name="readonly_layout_modes"/>
    18   <property name="hidden_layout_modes"/>
     18  <property name="hidden_layout_modes">
     19    view
     20  </property>>
    1921  <property name="hidden_readonly_layout_modes"/>
    2022  <property name="display_width">40</property>
    … …  
    2224 </widget>
    2325 <widget name="code" meta_type="WAeUPId Widget">
    24   <property name="title">Object ID</property>
     26  <property name="title">Object Id</property>
    2527  <property name="fields">
    2628   <element value="code"/>
    2729  </property>
    2830  <property name="is_required">True</property>
    29   <property name="label">Object ID</property>
    30   <property name="label_edit">Object ID</property>
     31  <property name="label">Object Id</property>
     32  <property name="label_edit">Object Id</property>
    3133  <property name="readonly_layout_modes"/>
    3234  <property name="hidden_layout_modes">

  • WAeUP_SRP/trunk/profiles/default/roots/campus.xml

    r535 r2013  
    66  <object name="students" portal_type="StudentsFolder" />
    77  <object name="pins" portal_type="ScratchCardBatchesFolder" />
     8  <object name="documents" portal_type="DocumentsFolder" />
    89</object>

  • WAeUP_SRP/trunk/profiles/default/schemas.xml

    r1944 r2013  
    2828 <object name="student_create" meta_type="CPS Schema"/>
    2929 <object name="student_personal" meta_type="CPS Schema"/>
    30  <object name="student_pume" meta_type="CPS Schema"/> 
    31  <object name="student_returning" meta_type="CPS Schema"/> 
     30 <object name="student_pume" meta_type="CPS Schema"/>
     31 <object name="student_returning" meta_type="CPS Schema"/>
    3232 <object name="student_search" meta_type="CPS Schema"/>
    3333 <object name="student_study_course" meta_type="CPS Schema"/>
    … …  
    3636 <object name="study_level" meta_type="CPS Schema"/>
    3737 <object name="university" meta_type="CPS Schema"/>
     38 <object name="waeup_common" meta_type="CPS Schema"/>
    3839</object>

  • WAeUP_SRP/trunk/profiles/default/skins.xml

    r1740 r2013  
    2525 <object name="waeup_utilities" meta_type="Filesystem Directory View"
    2626    directory="WAeUP_SRP/skins/waeup_utilities"/>
     27 <object name="waeup_documents" meta_type="Filesystem Directory View"
     28    directory="WAeUP_SRP/skins/waeup_documents"/>   
     29   
    2730 <skin-path name="CPSSkins">
    2831  <layer name="waeup_custom" insert-after="custom"/>
    … …  
    3336  <layer name="waeup_student" insert-after="waeup_custom"/>
    3437  <layer name="waeup_academics" insert-after="waeup_custom"/>
     38  <layer name="waeup_documents" insert-after="waeup_custom"/>
    3539  <layer name="waeup_accommodation" insert-after="waeup_custom"/>
    3640  <layer name="waeup_utilities" insert-after="waeup_custom"/>
    … …  
    5155  <layer name="waeup_student" insert-after="waeup_custom"/>
    5256  <layer name="waeup_academics" insert-after="waeup_custom"/>
     57  <layer name="waeup_documents" insert-after="waeup_custom"/>
    5358  <layer name="waeup_accommodation" insert-after="waeup_custom"/>
    5459  <layer name="waeup_utilities" insert-after="waeup_custom"/>

  • WAeUP_SRP/trunk/profiles/default/types.xml

    r1449 r2013  
    3232 <object name="StudyLevel" meta_type="CPS Flexible Type Information"/>
    3333 <object name="University" meta_type="CPS Flexible Type Information"/>
     34 <object name="DocumentsFolder" meta_type="CPS Flexible Type Information"/>
     35 <object name="WAeUPDocument" meta_type="CPS Flexible Type Information"/>
    3436</object>

  • WAeUP_SRP/trunk/profiles/default/vocabularies/local_gov_areas.xml

    r1449 r2013  
    2828    <item key="abia_ukwu_east" msgid="">Abia / Ukwu East</item>
    2929    <item key="abia_umuahia" msgid="">Abia / Umuahia</item>
    30     <item key="abia_umuahia_north" msgid="">Abia / Umuahia North</item>
    3130    <item key="abia_umuahia_south" msgid="">Abia / Umuahia South</item>
    3231    <item key="abia_umuahia-north" msgid="">Abia / Umuahia-North</item>

  • WAeUP_SRP/trunk/profiles/default/workflows.xml

    r1449 r2013  
    1919 <object name="workspace_folder_wf" meta_type="CPS Workflow"/>
    2020 <object name="workspace_folderish_content_wf" meta_type="CPS Workflow"/>
     21 <object name="waeup_document_wf" meta_type="CPS Workflow"/>
    2122 <bindings>
    2223  <default/>
    … …  
    123124   <bound-workflow workflow_id="workspace_folder_wf"/>
    124125  </type>
     126  <type type_id="DocumentsFolder">
     127   <bound-workflow workflow_id="waeup_section_wf"/>
     128  </type>
     129  <type type_id="WAeUPDocument">
     130   <bound-workflow workflow_id="waeup_document_wf"/>
     131  </type>
    125132 </bindings>
    126133</object>

  • WAeUP_SRP/trunk/skins/waeup_accommodation/hall_delete.py

    r1566 r2013  
    1919from Products.CMFCore.utils import getToolByName
    2020here = context
    21 if context.portal_type == "University":
    22     here = context.academics
    2321
    2422ti = getToolByName(here, 'portal_types').getTypeInfo(here.portal_type)

  • WAeUP_SRP/trunk/skins/waeup_custom/folder_delete.py

    r1366 r2013  
    1313"""
    1414
     15import logging
     16logger = logging.getLogger('Skins.folder_delete')
     17member_id = str(context.portal_membership.getAuthenticatedMember())
     18
    1519from Products.CMFCore.utils import getToolByName
    1620here = context
    17 if context.portal_type == "University":
    18     here = context.academics
     21
     22#if context.portal_type == "University":
     23#    here = context.academics
    1924
    2025ti = getToolByName(here, 'portal_types').getTypeInfo(here.portal_type)
    2126meth_id = ti.queryMethodID('view', 'folder_contents')
    2227ret_url = here.absolute_url() + '/' + meth_id
     28
    2329
    2430

  • WAeUP_SRP/trunk/skins/waeup_default/waeup_document_create_do.py

    r1724 r2013  
    1010from Products.CMFCore.utils import getToolByName
    1111request = context.REQUEST
    12 if type_name in ("StudyLevel","StudentStudyLevel"):
     12
     13if type_name in ("StudyLevel","StudentStudyLevel","WAeUPDocument"):
    1314    id = datamodel.get('code')
    1415else:

  • WAeUP_SRP/trunk/skins/waeup_default/waeup_edit_form.pt

    r1783 r2013  
    1313<metal:block define-macro="edit_form">
    1414<metal:block use-macro=template>
     15
     16
     17  <metal:block fill-slot="style_slot">
     18    <link rel="Stylesheet" type="text/css" href=""
     19      tal:attributes="href string:${base_url}document.css" />
     20
     21    <metal:block define-macro="widgets_javascript">
     22
     23    <tal:block condition="python:modules['Products.CPSUtil.integration'].isProductPresent('Products.FCKeditor')">
     24      <script type="text/javascript">
     25        var popup_editor_form = 'popup_fckeditor_form';
     26        var width = 640;
     27        var height = 520;
     28      </script>
     29    </tal:block>
     30
     31    <script type="text/javascript">
     32     function popup_rte(input_id, label_edit) {
     33       var args, value;
     34       value = document.getElementById(input_id).value;
     35       args = '?input_id='+input_id+'&amp;label_edit='+escape(label_edit);
     36       str_window_features = 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=1,dependent=1,width=' + width + ',height=' + height;
     37       popup = window.open(popup_editor_form + args, input_id, str_window_features);
     38       if (!popup.opener) {
     39         popup.opener = window;
     40       }
     41       return false;
     42     }
     43   </script>
     44   </metal:block>
     45  </metal:block>
     46
    1547 
    1648  <metal:block fill-slot="header">

  • WAeUP_SRP/trunk/skins/waeup_student/clearance_edit.py

    r1996 r2013  
    7676    info['clear_doc'].edit(mapping = {'cleared_date': current,})
    7777    wftool.doActionFor(info['student'],'clear_and_validate')
    78     psm = "Clearance and eligibility record is validated and and student is cleared!"
     78    psm = "Clearance and eligibility record is validated and student is cleared!"
    7979elif clear_and_validate_button and info['review_state'] == "cleared_and_validated":
    8080    psm = "This student is already cleared!"
Note: See TracChangeset for help on using the changeset viewer.