Values for page and title are always absolute

_resolveData always resolves the id from title and page fields starting
from the root namespace, since it doesn't know about the namespace of
the corresponding dataentry. Hence the dataentry dialog should always
consider the entered ids to be absolute and link them accordingly.

Author: micgro42

_test/db.test.php

@@ -116,4 +116,34 @@ function test_title_input_Heading () {
         $this->assertSame('doku.php?id=testpage" class="wikilink1" title="testpage">testpage',$actual_link);
     }
 
+    function test_title_input_stackns () {
+
+        $test_table = "---- datatable Testtable ----\n"
+            . "cols: %pageid%, test1\n";
+
+        global $ID;
+        $ID = 'foo:bar:start';
+
+        /** @var syntax_plugin_data_entry $plugin */
+        $plugin = plugin_load('syntax','data_table');
+
+        $handler = new Doku_Handler();
+        $data = $plugin->handle($test_table, 0, 0, $handler);
+        $renderer = new Doku_Renderer_xhtml();
+        $plugin->render('xhtml',$renderer,$data);
+
+        $result = $renderer->doc;
+
+        $actual_value = substr($result,strpos($result,'<td class="align test1">')+24);
+        $actual_value = substr($actual_value,0,strpos($actual_value,'</td>'));
+        $expected_value = 'foo|bar';
+        $this->assertSame($expected_value,$actual_value);
+
+        $actual_link = substr($result,strpos($result,'<td class="align pageid">')+25);
+        $actual_link = substr($actual_link,strpos($actual_link,'doku.php'));
+        $actual_link = substr($actual_link,0,strpos($actual_link,'</a>'));
+
+        $this->assertSame('doku.php?id=testpage" class="wikilink1" title="testpage">testpage',$actual_link);
+    }
+
 }

_test/helper.test.php

@@ -136,10 +136,10 @@ function testFormatData() {
         $this->assertEquals('value1, value2, val',
             $helper->_formatData(array('type' => ''), "value1\n value2\n val", $renderer));
 
-        $this->assertEquals('link: page ',
+        $this->assertEquals('link: :page ',
             $helper->_formatData(array('type' => 'page'), "page", $renderer));
 
-        $this->assertEquals('link: page title',
+        $this->assertEquals('link: :page title',
             $helper->_formatData(array('type' => 'title'), "page|title", $renderer));
 
         $this->assertEquals('link: page title',

_test/syntax_plugin_data_entry.test.php

@@ -100,7 +100,7 @@ function test_pageEntry_noTitle() {
         $result = substr($result,strpos($result,'<internallink>')+14);
         $result = unserialize($result);
 
-        $this->assertSame('foo',$result['id']);
+        $this->assertSame(':foo',$result['id']);
         $this->assertSame(null,$result['name'], 'page does not accept a title. useheading decides');
     }
 
@@ -121,7 +121,7 @@ function test_pageEntry_withTitle() {
         $result = substr($result,strpos($result,'<internallink>')+14);
         $result = unserialize($result);
 
-        $this->assertSame('foo_bar',$result['id'], 'for type page a title becomes part of the id');
+        $this->assertSame(':foo_bar',$result['id'], 'for type page a title becomes part of the id');
         $this->assertSame(null,$result['name'], 'page never accepts a title. useheading decides');
     }
 
@@ -184,7 +184,7 @@ function test_titleEntry_noTitle() {
         $result = substr($result,strpos($result,'<internallink>')+14);
         $result = unserialize($result);
 
-        $this->assertSame('foo',$result['id']);
+        $this->assertSame(':foo',$result['id']);
         $this->assertSame(null,$result['name'], 'no title should be given to internal link. Let useheading decide.');
     }
 
@@ -206,7 +206,7 @@ function test_titleEntry_withTitle() {
         $result = substr($result,strpos($result,'<internallink>')+14);
         $result = unserialize($result);
 
-        $this->assertSame('link:to:page',$result['id']);
+        $this->assertSame(':link:to:page',$result['id']);
         $this->assertSame('TitleOfPage',$result['name'], 'The Title provided should be the title shown.');
     }
 

helper.php

@@ -205,6 +205,13 @@ function _resolveData($value, $colname) {
         return $value;
     }
 
+    public function ensureAbsoluteId($id) {
+        if (substr($id,0,1) !== ':') {
+            $id = ':' . $id;
+        }
+        return $id;
+    }
+
     /**
      * Return XHTML formated data, depending on column type
      *
@@ -232,11 +239,13 @@ function _formatData($column, $value, Doku_Renderer_xhtml $R) {
             switch($type) {
                 case 'page':
                     $val = $this->_addPrePostFixes($column['type'], $val);
+                    $val = $this->ensureAbsoluteId($val);
                     $outs[] = $R->internallink($val, null, null, true);
                     break;
                 case 'title':
                     list($id, $title) = explode('|', $val, 2);
                     $id = $this->_addPrePostFixes($column['type'], $id);
+                    $id = $this->ensureAbsoluteId($id);
                     $outs[] = $R->internallink($id, $title, null, true);
                     break;
                 case 'pageid':
@@ -253,6 +262,7 @@ function _formatData($column, $value, Doku_Renderer_xhtml $R) {
                     }
 
                     $id = $this->_addPrePostFixes($column['type'], $id);
+
                     $outs[] = $R->internallink($id, $title, null, true);
                     break;
                 case 'nspage':