/[drupal]/contributions/modules/storm/stormtask/stormtask.admin.inc
ViewVC logotype

Diff of /contributions/modules/storm/stormtask/stormtask.admin.inc

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.7, Wed Jun 11 12:57:31 2008 UTC revision 1.8, Tue Jul 1 07:47:43 2008 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: stormtask.admin.inc,v 1.6 2008/05/20 08:13:05 robertogerola Exp $  // $Id: stormtask.admin.inc,v 1.7 2008/06/11 12:57:31 robertogerola Exp $
3    
4  /**  /**
5   * @file   * @file
# Line 151  function stormtask_list() { Line 151  function stormtask_list() {
151    );    );
152    
153    $where = array();    $where = array();
154    $s  = "SELECT n.*, sta.* FROM {stormtask} sta INNER JOIN {node} n ON n.nid=sta.nid WHERE n.status=1 AND n.type='stormtask' ";    $s  = "SELECT n.*, sta.* FROM {node} AS n INNER JOIN {stormtask} AS sta ON n.vid=sta.vid WHERE n.status=1 AND n.type='stormtask' ";
155    if ($_SESSION['stormtask_list_filter']['organization_nid']) {    if ($_SESSION['stormtask_list_filter']['organization_nid']) {
156      $where[] = 'sta.organization_nid='. $_SESSION['stormtask_list_filter']['organization_nid'];      $where[] = 'sta.organization_nid='. $_SESSION['stormtask_list_filter']['organization_nid'];
157    }    }
# Line 165  function stormtask_list() { Line 165  function stormtask_list() {
165    }    }
166    $itemsperpage = $_SESSION['stormtask_list_filter']['itemsperpage'];    $itemsperpage = $_SESSION['stormtask_list_filter']['itemsperpage'];
167    
168      $s = db_rewrite_sql($s);
169    $s = stormtask_access_sql($s, $where);    $s = stormtask_access_sql($s, $where);
170    $s = db_rewrite_sql($s, 'stormtask', 'nid');    $s = db_rewrite_sql($s, 'stormtask', 'nid');
171    
# Line 215  function stormtask_list_filter() { Line 216  function stormtask_list_filter() {
216      '#weight' => -20,      '#weight' => -20,
217    );    );
218    
219    $s = "SELECT n.nid, n.title FROM {stormorganization} sor INNER JOIN {node} n ON sor.nid=n.nid WHERE n.status=1 AND n.type='stormorganization' ORDER BY n.title";    $s = "SELECT n.nid, n.title FROM {node} AS n INNER JOIN {stormorganization} AS sor ON sor.vid=n.vid WHERE n.status=1 AND n.type='stormorganization' ORDER BY n.title";
220    $r = db_query(stormorganization_access_sql($s));    $r = db_query(stormorganization_access_sql($s));
221    $organizations = array();    $organizations = array();
222    while ($organization = db_fetch_object($r)) {    while ($organization = db_fetch_object($r)) {
# Line 230  function stormtask_list_filter() { Line 231  function stormtask_list_filter() {
231      '#attributes' => array('onchange' => "stormproject_organization_projects(this, 'edit-project-nid', true, 'All')"),      '#attributes' => array('onchange' => "stormproject_organization_projects(this, 'edit-project-nid', true, 'All')"),
232    );    );
233    
234    $s = "SELECT n.nid, n.title FROM {stormproject} spr INNER JOIN {node} n ON spr.nid=n.nid    $s = "SELECT n.nid, n.title FROM {node} AS n INNER JOIN {stormproject} AS spr ON spr.vid=n.vid
235    WHERE n.status=1 AND spr.organization_nid=%d AND n.type='stormproject' ORDER BY n.title";    WHERE n.status=1 AND spr.organization_nid=%d AND n.type='stormproject' ORDER BY n.title";
236    $r = db_query(stormproject_access_sql($s), $organization_nid);    $r = db_query(stormproject_access_sql($s), $organization_nid);
237    $projects = array();    $projects = array();
Legend:
Removed from v.1.7  
changed lines
  Added in v.1.8
  ViewVC Help
Powered by ViewVC 1.1.2