[myexperiment-hackers] [2766] branches/rails2/app/controllers/application_controller.rb: merged 2715:2716 from trunk to the application controller

[noreply]

Revision

2766

Author

dgc

Date

2011-10-25 18:23:11 -0400 (Tue, 25 Oct 2011)

Log Message

merged 2715:2716 from trunk to the application controller

Modified Paths

• branches/rails2/app/controllers/application_controller.rb

Diff

Modified: branches/rails2/app/controllers/application_controller.rb (2765 => 2766)

--- branches/rails2/app/controllers/application_controller.rb	2011-10-25 22:16:30 UTC (rev 2765)
+++ branches/rails2/app/controllers/application_controller.rb	2011-10-25 22:23:11 UTC (rev 2766)
@@ -537,6 +537,32 @@
           :joins        => [ :curation_events ],
           :capitalize   => true
         },
+
+        {
+          :title        => 'provider',
+          :query_option => 'SERVICE_PROVIDER',
+          :id_column    => 'service_providers.id',
+          :label_column => 'service_providers.name',
+          :joins        => [ :services, :service_providers ]
+        },
+
+        {
+          :title        => 'country',
+          :query_option => 'SERVICE_COUNTRY',
+          :id_column    => 'services.country',
+          :label_column => 'services.country',
+          :joins        => [ :services ]
+        },
+
+        {
+          :title        => 'service status',
+          :query_option => 'SERVICE_STATUS',
+          :id_column    => 'services.monitor_label',
+          :label_column => 'services.monitor_label',
+          :joins        => [ :services ]
+        },
+
+
       ],
 
       :joins =>
@@ -551,7 +577,9 @@
         :curation_events     => "INNER JOIN curation_events ON curation_events.object_type = AUTH_TYPE AND curation_events.object_id = AUTH_ID",
         :workflow_processors => "INNER JOIN workflow_processors ON AUTH_TYPE = 'Workflow' AND workflow_processors.workflow_id = AUTH_ID",
         :search              => "RIGHT OUTER JOIN search_results ON search_results.result_type = AUTH_TYPE AND search_results.result_id = AUTH_ID",
-        :topic_workflow_map  => "INNER JOIN topic_workflow_map ON contributions.id = topic_workflow_map.workflow_id"
+        :topic_workflow_map  => "INNER JOIN topic_workflow_map ON contributions.id = topic_workflow_map.workflow_id",
+        :services            => "INNER JOIN services ON AUTH_TYPE = 'Service' AND AUTH_ID = services.id",
+        :service_providers   => "INNER JOIN service_providers ON AUTH_TYPE = 'Service' AND service_providers.uri = services.provider_uri",
       }
     }
   end
@@ -984,7 +1012,7 @@
 
     if params["query"]
       drop_search_results_table
-      create_search_results_table(params["query"], [Workflow, Blob, Pack, User, Network])
+      create_search_results_table(params["query"], [Workflow, Blob, Pack, User, Network, Service])
       joins.push(:search) unless opts[:arbitrary_models]
     end