archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into phutil_tag

Browse Source 
(Sync.)
This commit is contained in:
epriestley
2013-02-07 08:08:01 -08:00
parent f864d9e611 3ce3f5d368
commit 11bb8db970
80 changed files with 2727 additions and 1188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/applications/conpherence/controller/ConpherenceController.php
View File

@@ -131,7 +131,10 @@ abstract class ConpherenceController extends PhabricatorController {
$user = $this->getRequest()->getUser();
foreach ($conpherences as $conpherence) {
$uri = $this->getApplicationURI('view/'.$conpherence->getID().'/');
$data = $conpherence->getDisplayData($user);
$data = $conpherence->getDisplayData(
$user,
null
);
$title = $data['title'];
$subtitle = $data['subtitle'];
$unread_count = $data['unread_count'];
@@ -206,6 +209,7 @@ abstract class ConpherenceController extends PhabricatorController {
'messages' => 'conpherence-messages',
'widgets_pane' => 'conpherence-widget-pane',
'form_pane' => 'conpherence-form',
'menu_pane' => 'conpherence-menu',
'fancy_ajax' => (bool) $this->getSelectedConpherencePHID()
)
);
@@ -219,6 +223,14 @@ abstract class ConpherenceController extends PhabricatorController {
'form_pane' => 'conpherence-form'
)
);
Javelin::initBehavior('conpherence-drag-and-drop-photo',
array(
'target' => 'conpherence-header-pane',
'form_pane' => 'conpherence-form',
'upload_uri' => '/file/dropupload/',
'activated_class' => 'conpherence-header-upload-photo',
)
);
}
}