srchub Commit Details

Date:

2016-03-26 17:08:31 (9 years 7 months ago)

Author:

Natalie Adams

Branch:

master

Commit:

31735c40489be6d23369ded6c725abc21283bd99

Parents:

99137ee2338f2948950eaab6a8c7e6bcbee52df9

Message:

Issue 147: Add repository type to forge management project list

Changes:

File differences

-140
141 141
142 142
143 
144 
145 
143
144
145
146
146 147
147 
148
149
148 150
149 151
150 152
+        $thisTable = $this->_con->pfx.'idf_projects';␊
        $this->_a['views'] = array(␊
            'repo_size' => [␊
                'join' => "INNER JOIN $confTable ON $thisTable.id = $confTable.project",␊
                'select' => $this->getSelect() . ', CAST(vdesc as UNSIGNED) as vdesc',␊
                'where' => 'vkey = "repository_size"',␊
                'join' => "INNER JOIN $confTable s ON $thisTable.id = s.project " .␊
                            "INNER JOIN $confTable t ON $thisTable.id = t.project ",␊
                'select' => $this->getSelect() . ', CAST(s.vdesc as UNSIGNED) as size, t.vdesc as scm',␊
                'where' => 's.vkey = "repository_size" AND t.vkey = "scm"',␊
                'props' => array(␊
                    'vdesc' => 'vdesc',␊
                    'size' => 'size',␊
                    'scm' => 'scm'␊
                ),␊
            ],␊
            'join_activities_and_tags' =>␊
         $thisTable = $this->_con->pfx.'idf_projects';␊
         $this->_a['views'] = array(␊
             'repo_size' => [␊
-                'join' => "INNER JOIN $confTable ON $thisTable.id = $confTable.project",␊
-                'select' => $this->getSelect() . ', CAST(vdesc as UNSIGNED) as vdesc',␊
-                'where' => 'vkey = "repository_size"',␊
+                'join' => "INNER JOIN $confTable s ON $thisTable.id = s.project " .␊
+                            "INNER JOIN $confTable t ON $thisTable.id = t.project ",␊
+                'select' => $this->getSelect() . ', CAST(s.vdesc as UNSIGNED) as size, t.vdesc as scm',␊
+                'where' => 's.vkey = "repository_size" AND t.vkey = "scm"',␊
                 'props' => array(␊
-                    'vdesc' => 'vdesc',␊
+                    'size' => 'size',␊
+                    'scm' => 'scm'␊
                 ),␊
             ],␊
             'join_activities_and_tags' =>␊

-289
290 290
291 291
292 
292
293 293
294 294
295 295
+                }␊
            }␊
        }␊
␉//print_r($this->list_display);␊
␊
        if (is_array($search_fields)) {␊
            $this->search_fields = $search_fields;␊
        }␊
                 }␊
             }␊
         }␊
-␉//print_r($this->list_display);␊
+␊
         if (is_array($search_fields)) {␊
             $this->search_fields = $search_fields;␊
         }␊

Download the corresponding diff file

srchub

File differences

Branches