Skip to content

Commit 18bc9ff

Browse files
lastlinklastlink
authored
Merge pull request #81 from funktechno/f/tests
F/tests
2 parents 90bc78e + 6fe6c0f commit 18bc9ff

12 files changed

+118
-67
lines changed

‎ChangeLog

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
Version 0.3.7
2+
Improvements:
3+
4+
* unit test updates
5+
* code cleanup
6+
7+
Bug fixes:
8+
9+
* Fix https://github.com/funktechno/kanboard-plugin-wiki/issues/
10+
111
Version 0.3.6
212
Improvements:
313

‎Controller/WikiAjaxController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function reorder_by_index(){
3535
}
3636

3737
try {
38-
$result = $this->wiki->reorderPagesByIndex($project_id, $values['src_wiki_id'], $values['index'], $values['parent_id'] ?? null);
38+
$result = $this->wikiModel->reorderPagesByIndex($project_id, $values['src_wiki_id'], $values['index'], $values['parent_id'] ?? null);
3939

4040
if (!$result) {
4141
$this->response->status(400);
@@ -70,7 +70,7 @@ public function reorder()
7070
// }
7171

7272
try {
73-
$result = $this->wiki->reorderPages($project_id, $values['src_wiki_id'], $values['target_wiki_id']);
73+
$result = $this->wikiModel->reorderPages($project_id, $values['src_wiki_id'], $values['target_wiki_id']);
7474

7575
if (!$result) {
7676
$this->response->status(400);

‎Controller/WikiController.php

+27-27
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ public function index()
2727
// exit();
2828

2929
// $query = $this->projectModel->getQueryByProjectIds($projectIds);
30-
$query = $this->wiki->getQueryByProjectIds($projectIds);
30+
$query = $this->wikiModel->getQueryByProjectIds($projectIds);
3131

3232

3333
// echo json_encode($query->findAll());
3434
// exit();
35-
// $wikipages = $this->wiki->getWikipages($project['id']);
35+
// $wikipages = $this->wikiModel->getWikipages($project['id']);
3636

3737
$search = $this->request->getStringParam('search');
3838

@@ -68,7 +68,7 @@ public function readonly()
6868
'no_layout' => true,
6969
'not_editable' => true,
7070
'title' => $project['name'] .= " ". t('Wiki'),
71-
'wikipages' => $this->wiki->getWikipages($project['id']),
71+
'wikipages' => $this->wikiModel->getWikipages($project['id']),
7272
), 'wiki:wiki/sidebar'));
7373
}
7474

@@ -86,11 +86,11 @@ public function show()
8686
$this->response->html($this->helper->layout->app('wiki:wiki/show', array(
8787
'project' => $project,
8888
'title' => $project['name'] .= " ". t('Wiki'),
89-
'wikipages' => $this->wiki->getWikipages($project['id']),
89+
'wikipages' => $this->wikiModel->getWikipages($project['id']),
9090
), 'wiki:wiki/sidebar'));
9191

9292
// ,array(
93-
// 'wikipages' => $this->wiki->getWikipages($project['id'])
93+
// 'wikipages' => $this->wikiModel->getWikipages($project['id'])
9494
// )
9595
}
9696

@@ -110,7 +110,7 @@ public function editions()
110110
'project' => $project,
111111
'title' => t('Wiki Editions'),
112112
'wiki_id'=> $wiki_id,
113-
'editions' => $this->wiki->getEditions($wiki_id),
113+
'editions' => $this->wikiModel->getEditions($wiki_id),
114114
), 'wiki:wiki/sidebar'));
115115

116116
}
@@ -120,14 +120,14 @@ public function edit(array $values = array(), array $errors = array())
120120

121121
$wiki_id = $this->request->getIntegerParam('wiki_id');
122122

123-
$editwiki = $this->wiki->getWikipage($wiki_id);
123+
$editwiki = $this->wikiModel->getWikipage($wiki_id);
124124

125125
// if (empty($values)) {
126126
// $values['date_creation'] = date('Y-m-d');
127127
// $values['date_modification'] = date('Y-m-d');
128128
// }
129129

130-
$wikipages = $this->wiki->getWikipages($editwiki['project_id']);
130+
$wikipages = $this->wikiModel->getWikipages($editwiki['project_id']);
131131

132132
$wiki_list = array('' => t('None'));
133133

@@ -157,7 +157,7 @@ public function detail_readonly() {
157157
}
158158
$wiki_id = $this->request->getIntegerParam('wiki_id');
159159

160-
$wikipages = $this->wiki->getWikipages($project['id']);
160+
$wikipages = $this->wikiModel->getWikipages($project['id']);
161161

162162
foreach ($wikipages as $page) {
163163
if (t($wiki_id) == t($page['id'])) {
@@ -179,9 +179,9 @@ public function detail_readonly() {
179179
'wiki' => $wikipage,
180180
'no_layout' => true,
181181
'not_editable' => true,
182-
'files' => $this->wikiFile->getAllDocuments($wiki_id),
183-
'images' => $this->wikiFile->getAllImages($wiki_id),
184-
// 'wikipage' => $this->wiki->getWikipage($wiki_id),
182+
'files' => $this->wikiFileModel->getAllDocuments($wiki_id),
183+
'images' => $this->wikiFileModel->getAllImages($wiki_id),
184+
// 'wikipage' => $this->wikiModel->getWikipage($wiki_id),
185185
'wikipage' => $wikipage,
186186
'wikipages' => $wikipages,
187187
), 'wiki:wiki/sidebar'));
@@ -210,7 +210,7 @@ public function detail()
210210

211211
$wiki_id = $this->request->getIntegerParam('wiki_id');
212212

213-
$wikipages = $this->wiki->getWikipages($project['id']);
213+
$wikipages = $this->wikiModel->getWikipages($project['id']);
214214
$wikiPagesResult = array();
215215

216216
foreach ($wikipages as $page) {
@@ -236,9 +236,9 @@ public function detail()
236236
'title' => t('Wikipage'),
237237
'wiki_id' => $wiki_id,
238238
'wiki' => $wikipage,
239-
'files' => $this->wikiFile->getAllDocuments($wiki_id),
240-
'images' => $this->wikiFile->getAllImages($wiki_id),
241-
// 'wikipage' => $this->wiki->getWikipage($wiki_id),
239+
'files' => $this->wikiFileModel->getAllDocuments($wiki_id),
240+
'images' => $this->wikiFileModel->getAllImages($wiki_id),
241+
// 'wikipage' => $this->wikiModel->getWikipage($wiki_id),
242242
'wikipage' => $wikipage,
243243
'wikipages' => $wikiPagesResult,
244244
), 'wiki:wiki/sidebar'));
@@ -251,13 +251,13 @@ public function detail()
251251
// 'project' => $project,
252252
// 'title' => t('Wikipage'),
253253
// 'wiki_id' => $wiki_id,
254-
// // 'wikipage' => $this->wiki->getWikipage($wiki_id),
254+
// // 'wikipage' => $this->wikiModel->getWikipage($wiki_id),
255255
// 'wikipage' => $wikipage,
256256
// 'wikipages' => $wikipages,
257257
// ), 'wiki:wiki/sidebar'));
258258

259259
// ,array(
260-
// 'wikipages' => $this->wiki->getWikipages($project['id'])
260+
// 'wikipages' => $this->wikiModel->getWikipages($project['id'])
261261
// )
262262
}
263263

@@ -270,7 +270,7 @@ public function detail()
270270
// ->setMax(30)
271271
// ->setOrder('start')
272272
// ->setDirection('DESC')
273-
// ->setQuery($this->wiki->getSubtaskBreakdown($project['id']))
273+
// ->setQuery($this->wikiModel->getSubtaskBreakdown($project['id']))
274274
// ->calculate();
275275

276276
// $this->response->html($this->helper->layout->project('wiki:wiki/breakdown', array(
@@ -305,7 +305,7 @@ public function restore()
305305
// $this->checkCSRFParam();
306306
$project = $this->getProject();
307307

308-
if ($this->wiki->restoreEdition($this->request->getIntegerParam('wiki_id'), $this->request->getIntegerParam('edition'))) {
308+
if ($this->wikiModel->restoreEdition($this->request->getIntegerParam('wiki_id'), $this->request->getIntegerParam('edition'))) {
309309
$this->flash->success(t('Edition was restored successfully.'));
310310
$this->response->redirect($this->helper->url->to('WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $this->request->getIntegerParam('wiki_id'))), true);
311311
// $this->url->link(t($page['title']), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $page['id']))
@@ -348,16 +348,16 @@ public function save()
348348
$project = $this->getProject();
349349

350350
$values = $this->request->getValues();
351-
list($valid, $errors) = $this->wiki->validatePageCreation($values);
351+
list($valid, $errors) = $this->wikiModel->validatePageCreation($values);
352352

353353
if ($valid) {
354354

355355
$newDate = date('Y-m-d');
356356

357-
$wiki_id = $this->wiki->createpage($values['project_id'], $values['title'], $values['content'], $newDate);
357+
$wiki_id = $this->wikiModel->createpage($values['project_id'], $values['title'], $values['content'], $newDate);
358358
if ($wiki_id > 0) {
359359

360-
$this->wiki->createEdition($values, $wiki_id, 1, $newDate);
360+
$this->wikiModel->createEdition($values, $wiki_id, 1, $newDate);
361361
// don't really care if edition was successful
362362

363363
$this->flash->success(t('The wikipage has been created successfully.'));
@@ -389,18 +389,18 @@ public function update()
389389
// $project = $this->getProject();
390390

391391
$values = $this->request->getValues();
392-
list($valid, $errors) = $this->wiki->validatePageUpdate($values);
392+
list($valid, $errors) = $this->wikiModel->validatePageUpdate($values);
393393

394394
if ($valid) {
395395

396396
$newDate = date('Y-m-d');
397397
$editions = $values['editions'] + 1;
398398

399-
$wiki_id = $this->wiki->updatepage($values, $editions, $newDate);
399+
$wiki_id = $this->wikiModel->updatepage($values, $editions, $newDate);
400400
if ($wiki_id > 0) {
401401

402402
// check config if admin wants editions saved
403-
$this->wiki->createEdition($values, $wiki_id, $editions, $newDate);
403+
$this->wikiModel->createEdition($values, $wiki_id, $editions, $newDate);
404404
// don't really care if editions was successful, begin transaction not really needed
405405

406406
$this->flash->success(t('The wikipage has been updated successfully.'));
@@ -443,7 +443,7 @@ public function remove()
443443
$wiki_id = $this->request->getIntegerParam('wiki_id');
444444

445445
// First delete all associated files, then delete the page itself.
446-
if ($this->wikiFile->removeAll($wiki_id) && $this->wiki->removepage($wiki_id)) {
446+
if ($this->wikiFileModel->removeAll($wiki_id) && $this->wikiModel->removepage($wiki_id)) {
447447
$this->flash->success(t('Wiki page removed successfully.'));
448448
} else {
449449
$this->flash->failure(t('Unable to remove this wiki page.'));

‎Controller/WikiFileController.php

+12-12
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ class WikiFileController extends BaseController
1919
*/
2020
public function screenshot()
2121
{
22-
$wiki = $this->wiki->getWiki();
22+
$wiki = $this->wikiModel->getWiki();
2323

24-
if ($this->request->isPost() && $this->wikiFile->uploadScreenshot($wiki['id'], $this->request->getValue('screenshot')) !== false) {
24+
if ($this->request->isPost() && $this->wikiFileModel->uploadScreenshot($wiki['id'], $this->request->getValue('screenshot')) !== false) {
2525
$this->flash->success(t('Screenshot uploaded successfully.'));
2626
return $this->response->redirect($this->helper->url->to('WikiViewController', 'show', array('wiki_id' => $wiki['id'], 'project_id' => $wiki['project_id'])), true);
2727
}
@@ -41,12 +41,12 @@ public function create()
4141
ini_set('display_errors', 1);
4242
ini_set('display_startup_errors', 1);
4343
error_reporting(E_ALL);
44-
$wiki = $this->wiki->getWiki();
44+
$wiki = $this->wikiModel->getWiki();
4545

4646
// $this->hourlyRate->getAllByProject($records[0]['project_id']);
47-
// $this->wikiFile->getAllByProject($records[0]['project_id']);
47+
// $this->wikiFileModel->getAllByProject($records[0]['project_id']);
4848

49-
// $this->wiki->getDailyWikiBreakdown($project['id']),
49+
// $this->wikiModel->getDailyWikiBreakdown($project['id']),
5050

5151
$this->response->html($this->template->render('wiki:wiki_file/create', array(
5252
'wiki' => $wiki,
@@ -65,9 +65,9 @@ public function save()
6565
ini_set('display_startup_errors', 1);
6666
error_reporting(E_ALL);
6767

68-
$wiki = $this->wiki->getWiki();
68+
$wiki = $this->wikiModel->getWiki();
6969

70-
$result = $this->wikiFile->uploadFiles($wiki['id'], $this->request->getFileInfo('files'));
70+
$result = $this->wikiFileModel->uploadFiles($wiki['id'], $this->request->getFileInfo('files'));
7171

7272
if ($this->request->isAjax()) {
7373
if (!$result) {
@@ -94,10 +94,10 @@ public function save()
9494
public function remove()
9595
{
9696
$this->checkCSRFParam();
97-
$wiki = $this->wiki->getWiki();
98-
$file = $this->wikiFile->getById($this->request->getIntegerParam('file_id'));
97+
$wiki = $this->wikiModel->getWiki();
98+
$file = $this->wikiFileModel->getById($this->request->getIntegerParam('file_id'));
9999

100-
if ($file['wikipage_id'] == $wiki['id'] && $this->wikiFile->remove($file['id'])) {
100+
if ($file['wikipage_id'] == $wiki['id'] && $this->wikiFileModel->remove($file['id'])) {
101101
$this->flash->success(t('File removed successfully.'));
102102
} else {
103103
$this->flash->failure(t('Unable to remove this file.'));
@@ -113,8 +113,8 @@ public function remove()
113113
*/
114114
public function confirm()
115115
{
116-
$wiki = $this->wiki->getWiki();
117-
$file = $this->wikiFile->getById($this->request->getIntegerParam('file_id'));
116+
$wiki = $this->wikiModel->getWiki();
117+
$file = $this->wikiFileModel->getById($this->request->getIntegerParam('file_id'));
118118

119119
$this->response->html($this->template->render('wiki:wiki_file/remove', array(
120120
'wiki' => $wiki,

‎Controller/WikiFileViewController.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ protected function renderFileWithCache(array $file, $mimetype)
6161
*/
6262
public function show()
6363
{
64-
$file = $this->wikiFile->getById($this->request->getIntegerParam('fid'));
64+
$file = $this->wikiFileModel->getById($this->request->getIntegerParam('fid'));
6565
$type = $this->helper->file->getPreviewType($file['name']);
6666
$params = array('file_id' => $file['id'], 'project_id' => $this->request->getIntegerParam('project_id'));
6767

@@ -84,7 +84,7 @@ public function show()
8484
*/
8585
public function image()
8686
{
87-
$file = $this->wikiFile->getById($this->request->getIntegerParam('file_id'));
87+
$file = $this->wikiFileModel->getById($this->request->getIntegerParam('file_id'));
8888
$this->renderFileWithCache($file, $this->helper->file->getImageMimeType($file['name']));
8989
}
9090

@@ -95,7 +95,7 @@ public function image()
9595
*/
9696
public function browser()
9797
{
98-
$file = $this->wikiFile->getById($this->request->getIntegerParam('fid'));
98+
$file = $this->wikiFileModel->getById($this->request->getIntegerParam('fid'));
9999
$this->renderFileWithCache($file, $this->helper->file->getBrowserViewType($file['name']));
100100
}
101101

@@ -106,7 +106,7 @@ public function browser()
106106
*/
107107
public function thumbnail()
108108
{
109-
$file = $this->wikiFile->getById($this->request->getIntegerParam('file_id'));
109+
$file = $this->wikiFileModel->getById($this->request->getIntegerParam('file_id'));
110110
$model = 'wikiFile';
111111
$filename = $this->$model->getThumbnailPath($file['path']);
112112
$etag = md5($filename);
@@ -142,7 +142,7 @@ public function thumbnail()
142142
public function download()
143143
{
144144
try {
145-
$file = $this->wikiFile->getById($this->request->getIntegerParam('file_id'));
145+
$file = $this->wikiFileModel->getById($this->request->getIntegerParam('file_id'));
146146
$file['model'] = 'wikiFile';
147147
$this->response->withFileDownload($file['name']);
148148
$this->response->send();

‎Model/WikiEventBuilder.php ‎EventBuilder/WikiEventBuilder.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Kanboard\Plugin\Wiki\Model;
3+
namespace Kanboard\Plugin\Wiki\EventBuilder;
44

55
use Kanboard\EventBuilder\BaseEventBuilder;
66
use Kanboard\Event\CommentEvent;
@@ -49,7 +49,7 @@ public function withTitle($title, $projectId)
4949
*/
5050
public function buildEvent()
5151
{
52-
$wikiPage = $this->wiki->getWikipage($this->wiki_id);
52+
$wikiPage = $this->wikiModel->getWikipage($this->wiki_id);
5353

5454
if (empty($wikiPage)) {
5555
return null;

‎Helper/WikiHelper.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function getWikipages($project_id)
2525
{
2626
return null;
2727
// return wiki::getWikipages($project['id']);
28-
// return $this->wiki->getWikipages($project['id']);
28+
// return $this->wikiModel->getWikipages($project['id']);
2929
// return $this->db->table(self::WIKITABLE)->eq('project_id', $project_id)->desc('order')->findAll();
3030
}
3131
/**

‎Model/WikiEventJob.php ‎Job/WikiEventJob.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<?php
22

3-
namespace Kanboard\Plugin\Wiki\Model;
3+
namespace Kanboard\Plugin\Wiki\Job;
44

55
use Kanboard\Job\BaseJob;
6-
// use Kanboard\EventBuilder\CommentEventBuilder;
7-
// use Kanboard\Model\CommentModel;
6+
use Kanboard\Plugin\Wiki\EventBuilder\WikiEventBuilder;
87

98
/**
109
* Class WikiEventJob

‎Model/WikiFile.php ‎Model/WikiFileModel.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* @package Kanboard\Model
1212
* @author Frederic Guillot
1313
*/
14-
class WikiFile extends FileModel
14+
class WikiFileModel extends FileModel
1515
{
1616
/**
1717
* Table name

‎Model/Wiki.php ‎Model/WikiModel.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
use Kanboard\Model\UserModel;
1010
use SimpleValidator\Validator;
1111
use SimpleValidator\Validators;
12+
use Kanboard\Plugin\Wiki\Job\WikiEventJob;
1213

1314
/**
1415
* Wiki
1516
*
1617
* @package model
1718
* @author Frederic Guillot
1819
*/
19-
class Wiki extends Base
20+
class WikiModel extends Base
2021
{
2122
/**
2223
* SQL table name

0 commit comments

Comments
 (0)