natalie/indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move the Wiki* models into the IDF_Wiki_* namespace and adapt all models,

Browse Source 
table names and relations accordingly.
Start with a resource and resource revision model and add migrations for
that as well.
Note in NEWS.mdtext that we need a more recent Pluf version to take
advantage of the MySQL introspection implementation.
This commit is contained in:
Thomas Keller
2011-11-06 01:05:27 +01:00
parent e6e20e4f93
commit b09a7d2fd2
18 changed files with 671 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/IDF/Form/WikiUpdate.php
View File

@@ -33,7 +33,7 @@ class IDF_Form_WikiUpdate extends Pluf_Form
public $project = null;
public $page = null;
public $show_full = false;
public function initFields($extra=array())
{
@@ -118,9 +118,9 @@ class IDF_Form_WikiUpdate extends Pluf_Form
if (preg_match('/[^a-zA-Z0-9\-]/', $title)) {
throw new Pluf_Form_Invalid(__('The title contains invalid characters.'));
}
$sql = new Pluf_SQL('project=%s AND title=%s',
$sql = new Pluf_SQL('project=%s AND title=%s',
array($this->project->id, $title));
$pages = Pluf::factory('IDF_WikiPage')->getList(array('filter'=>$sql->gen()));
$pages = Pluf::factory('IDF_Wiki_Page')->getList(array('filter'=>$sql->gen()));
if ($pages->count() > 0 and $pages[0]->id != $this->page->id) {
throw new Pluf_Form_Invalid(__('A page with this title already exists.'));
}
@@ -148,7 +148,7 @@ class IDF_Form_WikiUpdate extends Pluf_Form
$this->cleaned_data['label'.$i] = trim($this->cleaned_data['label'.$i]);
if (strpos($this->cleaned_data['label'.$i], ':') !== false) {
list($class, $name) = explode(':', $this->cleaned_data['label'.$i], 2);
list($class, $name) = array(mb_strtolower(trim($class)),
list($class, $name) = array(mb_strtolower(trim($class)),
trim($name));
} else {
$class = 'other';
@@ -229,7 +229,7 @@ class IDF_Form_WikiUpdate extends Pluf_Form
}
$this->page->update();
// add the new revision
$rev = new IDF_WikiRevision();
$rev = new IDF_Wiki_PageRevision();
$rev->wikipage = $this->page;
$rev->content = $this->cleaned_data['content'];
$rev->submitter = $this->user;