Changeset 1371


Ignore:
Timestamp:
02/14/07 14:28:41 (13 years ago)
Author:
jukka
Message:

Made a bad decision to change property 'relatedActivities' to 'relatedMethods' in last commit, this reverts it. Would have made new stories incompatible with existing stories.

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/LeMillTool.py

    r1370 r1371  
    195195        if content and method and tool: 
    196196            story=None 
     197            stories2=pc({'getRawRelatedContent':content.UID(), 'getRawRelatedMethods':method.UID(), 'getRawRelatedTools':tool.UID()}) 
     198            print stories2 
     199             
    197200            relations_to_this_content=rc({'relationship':'relatesToContent', 'targetUID':content.UID()}) 
    198201            stories=[x.sourceUID for x in relations_to_this_content] 
  • trunk/Story.py

    r1370 r1371  
    6666            ) 
    6767        ), 
    68     ReferenceField('relatedMethods', 
    69         relationship = 'relatesToMethods', 
     68    ReferenceField('relatedActivities', 
     69        relationship = 'relatesToActivities', 
    7070        multiValued = True, 
    7171        isMetadata = True, 
  • trunk/skins/lemill/new_story.py

    r1370 r1371  
    4545    refs_to_tools.append(tool)     
    4646 
    47 obj.setRelatedMethods(refs_to_methods) 
     47obj.setRelatedActivities(refs_to_methods) 
    4848obj.setRelatedTools(refs_to_tools) 
    4949obj.setRelatedContent(refs_to_content) 
  • trunk/skins/lemill/portlet_story_actions.pt

    r1028 r1371  
    33      i18n:domain="lemill"> 
    44<body> 
    5 <div metal:define-macro="portlet" id="portlet-material-actions"> 
     5<div metal:define-macro="portlet" id="portlet-material-actions"  
     6        tal:define="path_end python:here.REQUEST['URL'].split('/')[-1]; 
     7                    is_History python:path_end=='history_view' or here.REQUEST.get('version',0); 
     8                    is_Translation python:path_end=='show_translations'; 
     9                    is_owner here/amIOwner; 
     10                    can_moderate here/canIModerate;"> 
     11<tal:visible condition="python:wf_state!='deleted'"> 
     12    <div class="tb-portlet" metal:use-macro="here/portlet_activity_actions/macros/image_div"/> 
    613 
    7 <div class="tb-portlet" metal:define-macro="edit_div" tal:condition="context/amIOwner"> 
    8     <ul> 
    9         <li> 
    10             <a href="" tal:attributes="href string:${context/absolute_url}/edit"><tal:block i18n:domain="plone" i18n:translate="label_edit">Edit</tal:block>...</a> 
    11         </li> 
    12     </ul> 
    13 </div> 
     14    <tal:history condition="is_History"> 
     15    <div class="tb-portlet" metal:use-macro="here/portlet_material_actions/macros/history_div"/> 
     16    </tal:history> 
     17 
     18    <tal:hide condition="not:is_History"> 
     19    <div class="tb-portlet" metal:use-macro="here/portlet_material_actions/macros/edit_div"/> 
     20    <div class="tb-portlet" metal:use-macro="here/portlet_material_actions/macros/collections_div"/> 
     21     
     22    </tal:hide> 
     23</tal:visible> 
     24<tal:deleted condition="python:wf_state=='deleted'"> 
     25    <div class="tb-portlet" metal:use-macro="here/portlet_material_actions/macros/restore_div"/> 
     26</tal:deleted> 
    1427 
    1528</div> 
  • trunk/skins/lemill/story_edit.cpt

    r1370 r1371  
    8181        <table width="504" border="0" cellpadding="0" cellspacing="8"  
    8282          tal:define="chcontent python:context.getRelatedContent(); 
    83               method python:context.getRelatedMethods(); 
     83              method python:context.getRelatedActivities(); 
    8484              tool python:context.getRelatedTools();"> 
    8585            <tr> 
Note: See TracChangeset for help on using the changeset viewer.