Changeset 17901

Timestamp:

10/03/08 16:58:44 (2 months ago)

Author:

flack

Message:

update to new relatedto class name

Files:

• trunk/midcom/net.nemein.wiki/handler/emailimport.php (modified) (1 diff)
• trunk/midcom/org.openpsa.calendar/cron/reporthours.php (modified) (2 diffs)
• trunk/midcom/org.openpsa.calendar/event.php (modified) (4 diffs)
• trunk/midcom/org.openpsa.contacts/style/show-group.php (modified) (1 diff)
• trunk/midcom/org.openpsa.invoices/admin.php (deleted)
• trunk/midcom/org.openpsa.invoices/handler/edit.php (modified) (1 diff)
• trunk/midcom/org.openpsa.invoices/handler/list.php (modified) (1 diff)
• trunk/midcom/org.openpsa.projects/handler/task/view.php (modified) (1 diff)
• trunk/midcom/org.openpsa.projects/midcom/interfaces.php (modified) (3 diffs)
• trunk/midcom/org.openpsa.relatedto/config/midcom_dba_classes.inc (modified) (1 diff)
• trunk/midcom/org.openpsa.relatedto/handler.php (modified) (9 diffs)
• trunk/midcom/org.openpsa.relatedto/handler/relatedto.php (modified) (5 diffs)
• trunk/midcom/org.openpsa.relatedto/midcom/interfaces.php (modified) (2 diffs)
• trunk/midcom/org.openpsa.relatedto/suspect.php (modified) (1 diff)
• trunk/midcom/org.openpsa.reports/handler/sales/report.php (modified) (1 diff)
• trunk/midcom/org.openpsa.sales/handler/deliverable/report.php (modified) (1 diff)
• trunk/midcom/org.openpsa.sales/midcom/interfaces.php (modified) (3 diffs)
• trunk/midcom/org.openpsa.sales/salesproject.php (modified) (1 diff)
• trunk/midcom/org.openpsa.sales/salesproject/deliverable.php (modified) (2 diffs)
• trunk/midcom/org.openpsa.sales/style/show-debug.php (modified) (2 diffs)

trunk/midcom/net.nemein.wiki/handler/emailimport.php

@@ -278 +278 @@
-            }
-            //Find persons suspected relations and create links
-
+_dba
-            $link_def->fromComponent = 'net.nemein.wiki';
-            $link_def->fromGuid = $wikipage->guid;

trunk/midcom/org.openpsa.calendar/cron/reporthours.php

@@ -40 +40 @@
-
-        $_MIDCOM->load_library('org.openpsa.relatedto');
-
+_dba
-        {
-            debug_add('relatedto library could not be loaded', MIDCOM_LOG_WARN);
@@ -114 +114 @@
-            if (!isset($event_links[$event->guid]))
-            {
-
+_dba
-                $qb2->add_constraint('fromGuid', '=', $event->guid);
-                $qb2->add_constraint('fromComponent', '=', 'org.openpsa.calendar');

trunk/midcom/org.openpsa.calendar/event.php

@@ -485 +485 @@
-     * Returns a defaults template for relatedto objects
-     *
-
+_dba
-     */
-    function _suspect_defaults()
-    {
-
+_dba
-        $link_def->fromComponent = 'org.openpsa.calendar';
-        $link_def->fromGuid = $this->guid;
@@ -520 +520 @@
-
-        // Do no seek if we already have confirmed links
-
+_dba
-        $qb->add_constraint('status', '=', ORG_OPENPSA_RELATEDTO_STATUS_CONFIRMED);
-        $qb->add_constraint('fromGuid', '=',  $this->guid);
@@ -566 +566 @@
-    function _suspects_classes_present()
-    {
-
+_dba
-            || !class_exists('org_openpsa_relatedto_suspect'))
-        {
@@ -590 +590 @@
-
-        // Do no seek if we already have confirmed links
-
+_dba
-        $qb->add_constraint('status', '=', ORG_OPENPSA_RELATEDTO_STATUS_CONFIRMED);
-        $qb->add_constraint('fromGuid', '=',  $this->guid);

trunk/midcom/org.openpsa.contacts/style/show-group.php

@@ -24 +24 @@
-    }
-    ?>
-.
-.
+ . 
+ . 
-
-    <!-- TODO: Add salesprojects here -->

trunk/midcom/org.openpsa.invoices/handler/edit.php

@@ -207 +207 @@
-
-            // Close "Send invoice" task
-
+_dba
-            $qb->add_constraint('toGuid', '=', $this->_request_data['invoice']->guid);
-            $qb->add_constraint('fromComponent', '=', 'org.openpsa.projects');

trunk/midcom/org.openpsa.invoices/handler/list.php

@@ -312 +312 @@
-        $this->_request_data['list_type'] = 'all';
-
-
+_dba
-        $relation_qb->add_constraint('toGuid', '=', $this->_request_data['deliverable']->guid);
-        $relation_qb->add_constraint('fromComponent', '=', 'org.openpsa.invoices');

trunk/midcom/org.openpsa.projects/handler/task/view.php

@@ -173 +173 @@
-            'suspected' => array(),
-        );
-
+_dba
-        $qb->add_constraint('toGuid', '=', $task->guid);
-        $qb->add_constraint('fromComponent', '=', 'org.openpsa.calendar');

trunk/midcom/org.openpsa.projects/midcom/interfaces.php

@@ -292 +292 @@
-            $to_array = array('other_obj' => false, 'link' => false);
-            $task = new org_openpsa_projects_task($resource->task);
-
+_dba
-            org_openpsa_relatedto_suspect::defaults_helper($link, $defaults, $this->_component, $task);
-            $to_array['other_obj'] = $task;
@@ -336 +336 @@
-            $to_array = array('other_obj' => false, 'link' => false);
-            $task = new org_openpsa_projects_task($resource->task);
-
+_dba
-            org_openpsa_relatedto_suspect::defaults_helper($link, $defaults, $this->_component, $task);
-            $to_array['other_obj'] = $task;
@@ -406 +406 @@
-        $link = org_openpsa_relatedto_handler::create_relatedto($hr, 'org.openpsa.projects', $from_object, $from_component);
-        if (   !is_object($link)
-
+_dba
-        {
-            debug_add("failed to create link from hour_report #{$hr->id} to " . get_class($from_object) . " {$from_object->guid}, errstr: " . mgd_errstr(), MIDCOM_LOG_WARN);

trunk/midcom/org.openpsa.relatedto/config/midcom_dba_classes.inc

@@ -3 +3 @@
-    'old_class_name' => null,
-    'new_class_name' => 'org_openpsa_relatedto',
-
+_dba
-),

trunk/midcom/org.openpsa.relatedto/handler.php

@@ -33 +33 @@
-        }
-
-
+_dba
-        $rel->fromClass = get_class($from_obj);
-        $rel->toClass = get_class($to_obj);
@@ -63 +63 @@
-        foreach($_REQUEST['org_openpsa_relatedto'] as $rel_array)
-        {
-
+_dba
-            foreach($rel_array as $k => $v)
-            {
@@ -70 +70 @@
-            if ($id = $rel->check_db())
-            {
-
+_dba
-            }
-            $ret[]  = $rel;
@@ -125 +125 @@
-        foreach ($array as $rel)
-        {
-midcom_org_openpsa_relatedto')) //Matches also 'org_openpsa_relatedto_relatedto
+org_openpsa_relatedto')) //Matches also 'org_openpsa_relatedto_relatedto_dba
-            {
-                //Wrong type of object found in array, cruelly abort the whole procedure
@@ -275 +275 @@
-        }
-
-
+_dba
-        $related_to->toGuid = $bind_object->guid;
-        $related_to->toClass = get_class($bind_object);
@@ -334 +334 @@
-                    $related_to = org_openpsa_relatedto_handler::common_node_toolbar_buttons_sanitycheck($data, $button_component, $bind_object, $calling_component);
-                    if (   !is_object($related_to)
-
+_dba
-                    {
-                        debug_add("sanitycheck returned '{$related_to}' (relatedto object expected), skipping", MIDCOM_LOG_WARN);
@@ -358 +358 @@
-                    $related_to = org_openpsa_relatedto_handler::common_node_toolbar_buttons_sanitycheck($data, $button_component, $bind_object, $calling_component);
-                    if (   !is_object($related_to)
-
+_dba
-                    {
-                        debug_add("sanitycheck returned '{$related_to}' (relatedto object expected), skipping", MIDCOM_LOG_WARN);
@@ -388 +388 @@
-                    $related_to = org_openpsa_relatedto_handler::common_node_toolbar_buttons_sanitycheck($data, $button_component, $bind_object, $calling_component);
-                    if (   !is_object($related_to)
-
+_dba
-                    {
-                        debug_add("sanitycheck returned '{$related_to}' (relatedto object expected), skipping", MIDCOM_LOG_WARN);
@@ -425 +425 @@
-                    $related_to = org_openpsa_relatedto_handler::common_node_toolbar_buttons_sanitycheck($data, $button_component, $bind_object, $calling_component);
-                    if (   !is_object($related_to)
-
+_dba
-                    {
-                        debug_add("sanitycheck returned '{$related_to}' (relatedto object expected), skipping", MIDCOM_LOG_WARN);

trunk/midcom/org.openpsa.relatedto/handler/relatedto.php

@@ -432 +432 @@
-    {
-        $seen_emails = array();
-
+_dba
-        $qb->add_constraint('fromGuid', '=', $page->guid);
-        $qb->add_constraint('fromComponent', '=', 'net.nemein.wiki');
@@ -904 +904 @@
-            return false;
-        }
-
+_dba
-        $qb->add_constraint('toGuid', '=', $obj->guid);
-        $qb->add_constraint('status', '<>', ORG_OPENPSA_RELATEDTO_STATUS_NOTRELATED);
@@ -941 +941 @@
-            return false;
-        }
-
+_dba
-        $qb->add_constraint('fromGuid', '=', $obj->guid);
-        $qb->add_constraint('status', '<>', ORG_OPENPSA_RELATEDTO_STATUS_NOTRELATED);
@@ -1007 +1007 @@
-            case 'deny':
-                if (   !$this->_request_data['object']
-midcom_
+
-                {
-                    $ajax->simpleReply(false, "method '{$this->_request_data['mode']}' requires guid of a link object as an argument");
@@ -1017 +1017 @@
-            case 'confirm':
-                if (   !$this->_request_data['object']
-midcom_
+
-                {
-                    $ajax->simpleReply(false, "method '{$this->_request_data['mode']}' requires guid of a link object as an argument");

trunk/midcom/org.openpsa.relatedto/midcom/interfaces.php

@@ -65 +65 @@
-        }
-
-
+_dba
-        $qb->begin_group('OR');
-            $qb->add_constraint('fromGuid', '=', $person2->guid);
@@ -105 +105 @@
-        if ($version_not_18 = true)
-        {
-
+_dba
-            $qb->begin_group('OR');
-                $qb->add_constraint('creator', '=', $person2->id);

trunk/midcom/org.openpsa.relatedto/suspect.php

@@ -24 +24 @@
-     * Query all installed components for objects related to given object
-     *
-
+_dba
-     * it's used to fill default values for link objects returned.
-     *

trunk/midcom/org.openpsa.reports/handler/sales/report.php

@@ -115 +115 @@
-
-        // List relations of invoices to the deliverables we have
-
+_dba
-        $relation_qb->add_constraint('fromComponent', '=', 'org.openpsa.invoices');
-        $relation_qb->add_constraint('fromClass', '=', 'org_openpsa_invoices_invoice');

trunk/midcom/org.openpsa.sales/handler/deliverable/report.php

@@ -78 +78 @@
-
-        // List relations of invoices to the deliverables we have
-
+_dba
-        $relation_qb->add_constraint('fromComponent', '=', 'org.openpsa.invoices');
-        $relation_qb->add_constraint('fromClass', '=', 'org_openpsa_invoices_invoice');

trunk/midcom/org.openpsa.sales/midcom/interfaces.php

@@ -178 +178 @@
-            $to_array = array('other_obj' => false, 'link' => false);
-            $task = new org_openpsa_sales_salesproject($resource->salesproject);
-
+_dba
-            org_openpsa_relatedto_suspect::defaults_helper($link, $defaults, $this->_component, $task);
-            $to_array['other_obj'] = $task;
@@ -213 +213 @@
-                $to_array = array('other_obj' => false, 'link' => false);
-                $sp = new org_openpsa_sales_salesproject($member->salesproject);
-
+_dba
-                org_openpsa_relatedto_suspect::defaults_helper($link, $defaults, $this->_component, $sp);
-                $to_array['other_obj'] = $sp;
@@ -237 +237 @@
-                $seen_sp[$sp->id] = true;
-                $to_array = array('other_obj' => false, 'link' => false);
-
+_dba
-                org_openpsa_relatedto_suspect::defaults_helper($link, $defaults, $this->_component, $sp);
-                $to_array['other_obj'] = $sp;

trunk/midcom/org.openpsa.sales/salesproject.php

@@ -102 +102 @@
-        $this->next_action = $default;
-
-
+_dba
-        $qb->add_constraint('toGuid', '=', $this->guid);
-        //In theory I could limit just by the class but this is more robust in the long run

trunk/midcom/org.openpsa.sales/salesproject/deliverable.php

@@ -573 +573 @@
-    {
-        $at_entries = array();
-
+_dba
-        $relation_qb->add_constraint('toGuid', '=', $this->guid);
-        $relation_qb->add_constraint('fromComponent', '=', 'midcom.services.at');
@@ -592 +592 @@
-    {
-        $salesproject = new org_openpsa_sales_salesproject($this->salesproject);
-
+_dba
-        $relation_qb->add_constraint('toGuid', '=', $salesproject->guid);
-        $relation_qb->add_constraint('fromComponent', '=', 'org.openpsa.projects');

trunk/midcom/org.openpsa.sales/style/show-debug.php

@@ -16 +16 @@
-$_MIDCOM->componentloader->load('org.openpsa.calendar');
-$event = new org_openpsa_calendar_event(269);
-
+_dba
-$link_def->fromComponent = 'org.openpsa.calendar';
-$link_def->fromGuid = $event->guid;
@@ -33 +33 @@
-
-/*
-
+_dba
-$rel->fromComponent = 'org.openpsa.wiki';
-$rel->toComponent = 'org.openpsa.sales';