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

QnA - save answer revisions and show # of revisions

Browse Source
This commit is contained in:
Zach Copley 2011-04-01 23:59:35 -07:00
parent a466d4573a
commit 8e086d5a90
6 changed files with 229 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/QnA/QnAPlugin.php
View File

@ -124,6 +124,10 @@ class QnAPlugin extends MicroAppPlugin
'main/qna/newanswer',
array('action' => 'qnanewanswer')
);
$m->connect(
'main/qna/reviseanswer',
array('action' => 'qnareviseanswer')
);
$m->connect(
'question/vote/:id',
array('action' => 'qnavote', 'type' => 'question'),

4
plugins/QnA/actions/qnanewanswer.php
View File

@ -20,7 +20,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @category QuestonAndAnswer
* @category QnA
* @package StatusNet
* @author Zach Copley <zach@status.net>
* @copyright 2011 StatusNet, Inc.
@ -158,7 +158,7 @@ class QnanewanswerAction extends Action
$this->element('title', null, _m('Answers'));
$this->elementEnd('head');
$this->elementStart('body');
$this->raw()
$this->raw($this->answer->asHTML());
$this->elementEnd('body');
$this->elementEnd('html');
} else {

205
plugins/QnA/actions/qnareviseanswer.php Normal file
View File

@ -0,0 +1,205 @@
<?php
/**
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2011, StatusNet, Inc.
*
* Revise an answer
*
* PHP version 5
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @category QnA
* @package StatusNet
* @author Zach Copley <zach@status.net>
* @copyright 2011 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
if (!defined('STATUSNET')) {
// This check helps protect against security problems;
// your code file can't be executed directly from the web.
exit(1);
}
/**
* Revise an answer
*
* @category QnA
* @package StatusNet
* @author Zach Copley <zach@status.net>
* @copyright 2010 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
class QnareviseanswerAction extends Action
{
protected $user = null;
protected $error = null;
protected $question = null;
protected $answer = null;
protected $content = null;
/**
* Returns the title of the action
*
* @return string Action title
*/
function title()
{
// TRANS: Page title for revising a question
return _m('Revise answer');
}
/**
* For initializing members of the class.
*
* @param array $argarray misc. arguments
*
* @return boolean true
*/
function prepare($argarray)
{
parent::prepare($argarray);
if ($this->boolean('ajax')) {
StatusNet::setApi(true);
}
$this->user = common_current_user();
if (empty($this->user)) {
// TRANS: Client exception thrown trying to answer a question while not logged in.
throw new ClientException(
_m("You must be logged in to answer to a question."),
403
);
}
if ($this->isPost()) {
$this->checkSessionToken();
}
$id = substr($this->trimmed('id'), 7);
common_debug("XXXXXXXXXXXXXXXXXX id = " . $id);
$this->answer = QnA_Answer::staticGet('id', $id);
$this->question = $this->answer->getQuestion();
if (empty($this->answer) || empty($this->question)) {
// TRANS: Client exception thrown trying to respond to a non-existing question.
throw new ClientException(
_m('Invalid or missing answer.'),
404
);
}
$this->answerText = $this->trimmed('answer');
return true;
}
/**
* Handler method
*
* @param array $argarray is ignored since it's now passed in in prepare()
*
* @return void
*/
function handle($argarray=null)
{
parent::handle($argarray);
if ($this->isPost()) {
$this->reviseAnswer();
} else {
$this->showPage();
}
return;
}
/**
* Revise the answer
*
* @return void
*/
function reviseAnswer()
{
$answer = $this->answer;
try {
$orig = clone($answer);
$answer->content = $this->answerText;
$answer->revisions++;
$result = $answer->update($orig);
} catch (ClientException $ce) {
$this->error = $ce->getMessage();
$this->showPage();
return;
}
if ($this->boolean('ajax')) {
common_debug("ajaxy part");
header('Content-Type: text/xml;charset=utf-8');
$this->xw->startDocument('1.0', 'UTF-8');
$this->elementStart('html');
$this->elementStart('head');
// TRANS: Page title after sending an answer.
$this->element('title', null, _m('Answer'));
$this->elementEnd('head');
$this->elementStart('body');
$this->raw($answer->asHTML());
$this->elementEnd('body');
$this->elementEnd('html');
} else {
common_redirect($this->answer->bestUrl(), 303);
}
}
/**
* Show the revise answer form
*
* @return void
*/
function showContent()
{
if (!empty($this->error)) {
$this->element('p', 'error', $this->error);
}
$form = new QnareviseanswerForm($this->answer, $this);
$form->show();
return;
}
/**
* Return true if read only.
*
* MAY override
*
* @param array $args other arguments
*
* @return boolean is read only action?
*/
function isReadOnly($args)
{
if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
$_SERVER['REQUEST_METHOD'] == 'HEAD') {
return true;
} else {
return false;
}
}
}

10
plugins/QnA/classes/QnA_Answer.php
View File

@ -205,8 +205,16 @@ class QnA_Answer extends Managed_DataObject
{
$notice = $question->getNotice();
$fmt = '<span class="answer_author"><a href="%1$s">answer</a> by <a href="%2$s">%3$s</a></span>';
$fmt = '<p class="qna_answer">';
$fmt .= '<span class="answer_author"><a href="%1$s">answer</a> by <a href="%2$s">%3$s</a></span>';
$fmt .= '<span class="answer_content">%4$s</span>';
if (!empty($answer->revisions)) {
$fmt .= '<span class="answer_revisions">'
. $answer->revisions
. _m('revisions')
. '</span>';
}
$fmt .= '</p>';
return sprintf(
$fmt,

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

@ -221,11 +221,11 @@ class QnA_Question extends Managed_DataObject
{
$notice = $question->getNotice();
$fmt = '<div class="qna_question">';
$fmt = '<p class="qna_question">';
$fmt .= '<span class="question_title"><a href="%1$s">%2$s</a></span>';
$fmt .= '<span class="question_description">%3$s</span>';
$fmt .= '<span class="question_author">asked by <a href="%4$s">%5$s</a></span>';
$fmt .= '</div>';
$fmt .= '</p>';
$q = sprintf(
$fmt,

11
plugins/QnA/lib/qnareviseanswerform.php
View File

@ -91,7 +91,7 @@ class QnareviseanswerForm extends Form
*/
function action()
{
return common_local_url('qnareviseanswer', array('id' => $this->question->id));
return common_local_url('qnareviseanswer');
}
/**
@ -101,12 +101,13 @@ class QnareviseanswerForm extends Form
*/
function formData()
{
$question = $this->question;
$out = $this->out;
$id = "question-" . $question->id;
$out->element('p', 'Your answer to:', $question->title);
$out->textarea('answerText', 'You said:', $this->answer->content);
$out->element('p', 'Your answer to:', $this->question->title);
$id = "answer-" . $this->answer->id;
$out->hidden('id', $id);
$out->textarea('answer', 'You said:', $this->answer->content);
}
/**