Changeset 17976

Show
Ignore:
Timestamp:
10/06/08 16:53:41 (2 months ago)
Author:
flack
Message:

removed some more midcom_helper_find_component_by_node calls

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/midcom/org.openpsa.mypage/handler/today.php

    r17937 r17976  
    152152 
    153153        // Add the JS file for "now working on" calculator 
    154         $_MIDCOM->add_jsfile(MIDCOM_STATIC_URL."/org.openpsa.projects/workingon.js"); 
     154        $_MIDCOM->add_jsfile(MIDCOM_STATIC_URL . "/org.openpsa.projects/workingon.js"); 
    155155        $_MIDCOM->add_link_head 
    156156        ( 
    …… 
    159159                'rel' => 'stylesheet', 
    160160                'type' => 'text/css', 
    161                 'href' => MIDCOM_STATIC_URL."/org.openpsa.projects/projects.css", 
     161                'href' => MIDCOM_STATIC_URL . "/org.openpsa.projects/projects.css", 
    162162            ) 
    163163        ); 
    …… 
    176176        $data['calendar_url'] = $structure->get_node_relative_url('org.openpsa.calendar'); 
    177177        $data['projects_url'] = $structure->get_node_full_url('org.openpsa.projects'); 
     178        $data['expenses_url'] = $structure->get_node_full_url('org.openpsa.expenses'); 
    178179        $data['wiki_url'] = $structure->get_node_relative_url('net.nemein.wiki'); 
    179180 

  • trunk/midcom/org.openpsa.mypage/style/show-today.php

    r17937 r17976  
    8080     
    8181    // List expenses 
    82     $expenses_node = midcom_helper_find_node_by_component('org.openpsa.expenses'); 
    83     if ($expenses_node) 
     82    if ($data['expenses_url']) 
    8483    { 
    8584        echo "<div class=\"expenses\">\n"; 
    …… 
    114113            echo "    </tr>\n"; 
    115114            echo "</table>\n"; 
    116             echo "<p><a href=\"{$expenses_node[MIDCOM_NAV_FULLURL]}\">" . sprintf($data['l10n']->get('see all %s hours'), round($total_hours, 1)). "</a></p>\n"; 
     115            echo "<p><a href=\"{$data['expenses_url']}\">" . sprintf($data['l10n']->get('see all %s hours'), round($total_hours, 1)). "</a></p>\n"; 
    117116        } 
    118117        else 
    119118        { 
    120           echo "<p><a href=\"{$expenses_node[MIDCOM_NAV_FULLURL]}\">" . $_MIDCOM->i18n->get_string('report hours', 'org.openpsa.expenses') . "</a></p>\n"; 
     119          echo "<p><a href=\"{$data['expenses_url']}\">" . $_MIDCOM->i18n->get_string('report hours', 'org.openpsa.expenses') . "</a></p>\n"; 
    121120        } 
    122121         

  • trunk/midcom/org.openpsa.projects/handler/task/list.php

    r17939 r17976  
    8181        $structure = new org_openpsa_core_structure(); 
    8282        $this->_request_data['contacts_url'] = $structure->get_node_full_url('org.openpsa.contacts'); 
    83         $this->_request_data['sales_node'] = midcom_helper_find_node_by_component('org.openpsa.sales'); 
     83        $this->_request_data['sales_url'] = $structure->get_node_full_url('org.openpsa.sales'); 
    8484        $this->_request_data['prefix'] = $_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX); 
    8585 
    …… 
    561561                    $agreement = new org_openpsa_sales_salesproject_deliverable($task->agreement); 
    562562                    $salesproject = new org_openpsa_sales_salesproject($agreement->salesproject); 
    563                     $agreement_url = "{$data['sales_node'][MIDCOM_NAV_FULLURL]}salesproject/{$salesproject->guid}"; 
     563                    $agreement_url = "{$data['sales_url']}salesproject/{$salesproject->guid}"; 
    564564                    $html = "<a href='{$agreement_url}'>{$agreement->title}</a>"; 
    565565                } 

  • trunk/midcom/org.openpsa.projects/style/show-task.php

    r5424 r17976  
    33$view_task =& $data['view_task']; 
    44$task =& $data['task']; 
    5 $sales_node = midcom_helper_find_node_by_component('org.openpsa.sales'); 
     5 
     6$structure = new org_openpsa_core_structure(); 
     7$sales_url = $structure->get_node_full_url('org.openpsa.sales'); 
     8 
    69$prefix = $_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX); 
    710?> 
    …… 
    7881            $agreement = new org_openpsa_sales_salesproject_deliverable($data['task']->agreement); 
    7982 
    80             if ($sales_node) 
     83            if ($sales_url) 
    8184            { 
    8285                $salesproject = new org_openpsa_sales_salesproject($agreement->salesproject); 
    83                 $agreement->deliverable_html = "<a href=\"{$sales_node[MIDCOM_NAV_FULLURL]}salesproject/{$salesproject->guid}/#{$agreement->guid}\">{$agreement->deliverable_html}</a>\n"; 
     86                $agreement->deliverable_html = "<a href=\"{$sales_url}salesproject/{$salesproject->guid}/#{$agreement->guid}\">{$agreement->deliverable_html}</a>\n"; 
    8487            } 
    8588