Merge pull request #1436 from Werzi2001/fix_award_dok_show_qsos

added missing join to station_profile to DOK award show qsos dialog

application/controllers/Awards.php

@@ -64,6 +64,7 @@ class Awards extends CI_Controller {
         $arguments["format"] = "json";
         $arguments["limit"] = '';
         $arguments["order"] = '';
+        $arguments["join_station_profile"] = true;
 
         // print_r($arguments);
         // return;

application/models/Api_model.php

@@ -250,6 +250,9 @@ class API_Model extends CI_Model {
 
 		// Append the table we're pulling data from
 		$q .= "FROM ".$this->config->item('table_name');
+		if (isset($arguments["join_station_profile"]) && $arguments["join_station_profile"]) {
+			$q .= " INNER JOIN station_profile ON ".$this->config->item('table_name').".station_id = station_profile.station_id";
+		}
 
 		// Parse the 'query' string, which is converted into a standard MySQL 'WHERE'
 		// clause.