Changeset 1385


Ignore:
Timestamp:
Jan 9, 2013, 3:09:11 AM (5 years ago)
Author:
dkg
Message:

handle organization view properly

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/jpdd/class.jpdd.organization.php

    r1383 r1385  
    175175     
    176176      if (count($requirements) == 0) {
    177        
     177        return $this->getListOfPeopleForEvent($jpdd->getActiveEventID());
    178178      }
    179179     
     
    352352      // FIXME: maybe show all affiliated people?
    353353      if ($jpdd->isAuthenticated() && $jpdd->_authenticated_user->hasAllOfThesePrivileges('List People')) {
    354         $ret .= $this->getListOfPeopleForConference($jpdd->getActiveEventID());
     354        $ret .= $this->getListOfPeopleForEvent($jpdd->getActiveEventID());
    355355      }
    356356      return $ret;
     
    368368WHERE event_id = '.$event.' AND organization_id = '.$this->getID(), 'person_id', 'title');
    369369      $applications = $jpdd->getKeyValuePairsFromSQL('SELECT person_id, category.title AS title FROM application JOIN
    370 category ON (category_id = category.id) JOIN affiliation USING (person_id) WHERE event_id = '.$jpdd->getActiveEventID().' AND organization_id = '.$this->getID(), 'person_id', 'title');
     370category ON (category_id = category.id) JOIN affiliation USING (person_id) WHERE event_id = '.$event.' AND organization_id = '.$this->getID(), 'person_id', 'title');
    371371
    372372      $ret .= '<h3>'.count($peops).(count($peops) == 1 ? ' Affiliated Person' : ' Affiliated People').'</h3><ul>'."\n";
     
    375375        $ret .= "<li>".$x->getLinkedTitle()." ".$x->getWorkshopText(false).
    376376          (array_key_exists($x->getID(), $roles) ? ' <span class="roletag">'.$roles[$x->getID()].'</span>' : '').
    377           (array_key_exists($x->getID(), $applications) ? ' <span class="applicationtag">'.$applications[$x->getID()].'</span>' : '')."\n";
     377          (array_key_exists($x->getID(), $applications) ? ' <span class="applicationtag">'.$applications[$x->getID()].'</span>' : '')."</li>\n";
    378378      $ret .= "</ul>\n";
    379379          return $ret;
Note: See TracChangeset for help on using the changeset viewer.