GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

QnA 

* show number of answers on question notices
* change label on answer submit button to "Answer"
This commit is contained in:
Zach Copley 2011-04-04 22:04:36 -07:00
parent 984869e5fb
commit cd7ab56874
4 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/QnA/classes/QnA_Question.php
View File

@ -189,9 +189,11 @@ class QnA_Question extends Managed_DataObject
function countAnswers() function countAnswers()
{ {
$a = new QnA_Answer(); $a = new QnA_Answer();
$a->question_id = $this->id; $a->question_id = $this->id;
return $a-count();
return $a->count();
} }
static function fromNotice($notice) static function fromNotice($notice)
@ -221,6 +223,14 @@ class QnA_Question extends Managed_DataObject
$out->elementEnd('span'); $out->elementEnd('span');
} }
$cnt = $question->countAnswers();
if (!empty($cnt)) {
$out->elementStart('span', 'answer-count');
$out->text(sprintf(_m('%s answers'), $cnt));
$out->elementEnd('span');
}
if (!empty($question->closed)) { if (!empty($question->closed)) {
$out->elementStart('span', 'question-closed'); $out->elementStart('span', 'question-closed');
$out->text(_m('This question is closed.')); $out->text(_m('This question is closed.'));

2
plugins/QnA/lib/qnanewanswerform.php
View File

@ -118,7 +118,7 @@ class QnanewanswerForm extends Form
function formActions() function formActions()
{ {
// TRANS: Button text for submitting a poll response. // TRANS: Button text for submitting a poll response.
$this->out->submit('submit', _m('BUTTON', 'Submit')); $this->out->submit('submit', _m('BUTTON', 'Answer'));
} }
} }

12
plugins/QnA/lib/qnashowanswerform.php
View File

@ -65,8 +65,8 @@ class QnashowanswerForm extends Form
{ {
parent::__construct($out); parent::__construct($out);
$this->answer = $answer; $this->answer = $answer;
$this->question = $answer->getQuestion(); $this->question = $answer->getQuestion();
} }
/** /**
@ -155,6 +155,13 @@ class QnashowanswerForm extends Form
} }
} }
/*
* @fixme: Revise is disabled until we figure out the
* Ostatus bits This comment is just a reminder
* that the UI for this works.
*/
/*
if ($user->id == $this->answer->profile_id) { if ($user->id == $this->answer->profile_id) {
$this->out->submit( $this->out->submit(
'revise', 'revise',
@ -166,6 +173,7 @@ class QnashowanswerForm extends Form
_('Revise your answer') _('Revise your answer')
); );
} }
*/
} }
} }