upload: test and fix upload current key

Author: ext

CHANGELOG.md

@@ -9,6 +9,7 @@
 
 ## Bugfixes
 
+  - File upload: `current` option using correct key.
   - Table: fixed group rendering for forms with only groups.
 
 # 1.2.2

docs/options.php

@@ -44,12 +44,18 @@
 				<dd>Description of the field</dd>
 				<dt>confirm</dt>
 				<dd>Buttons: adds a javascript confirmation prompt before submit/click</dd>
-				<dt>remove</dt>
-				<dd>Upload: adds a removal checkbox (e.g. a user avatar which is set if file is uploaded but retained if nothing is sent and removed if checkbox is checked)</dd>
 				<dt>Other</dt>
 				<dd>All other attributes is passed directly to field, allowing custom attributes such as <code>placeholder</code>, <code>title</code>, etc.</dd>
 			</dl>
 
+			<h3 id="upload-field">Upload field</h3>
+			<dl>
+				<dt>remove</dt>
+				<dd>Adds a removal checkbox (e.g. a user avatar which is set if file is uploaded but retained if nothing is sent and removed if checkbox is checked)</dd>
+				<dt>current</dt>
+				<dd>HTML to preview the current uploaded data, e.g. <code>&lt;img src="/user/123/avatar.png"/&gt;</code></dd>
+			</dl>
+
 			<h2>Serialization</h2>
 			<p>Most attributes is serialized using these rules:</p>
 			<ul>

src/Form.php

@@ -486,6 +486,7 @@ public function get_error($res){
 		return ucfirst($res->errors[$this->key][0]); /* get first error only */
 	}
 
+	public function get_name(){ return $this->key; }
 	public function get_label(){ return $this->label; }
 	public function get_content(){ return $this->content; }
 	public function get_hint(){ return $this->hint; }

src/lib/FormContainer.php

@@ -127,7 +127,7 @@ public function upload_field($key, $label=null, array $attr=array()) {
 		if ( $current !== false ){
 			$attr = array();
 			list($id, $name, $value) = $this->generate_data($key . '_current', $attr);
-			$this->fields[] = new ManualField("{$key}_remove", '', "<label>$current</label>", false);
+			$this->fields[] = new ManualField("{$key}_current", '', "<label>$current</label>", false);
 		}
 
 		if ( $remove ){

tests/FieldTest.php

@@ -39,4 +39,23 @@ public function testCustomField(){
 		$this->assertArrayHasKey('foo', $mock->field);
 		$this->assertEquals('email', $mock->field['foo']->attribute('type'));
 	}
+
+	public function testUploadField(){
+		$mock = new MockLayout();
+		$form = Form::create('id', function($f){
+			$f->upload_field('foo', 'Label');
+			$f->upload_field('bar', 'Label', ['remove' => true]);
+			$f->upload_field('baz', 'Label', ['current' => 'Preview']);
+		}, ['layout' => $mock]);
+		$this->assertArrayHasKey('foo', $mock->field);
+		$this->assertArrayNotHasKey('foo_remove', $mock->field);
+		$this->assertArrayNotHasKey('foo_current', $mock->field);
+		$this->assertArrayHasKey('bar', $mock->field);
+		$this->assertArrayHasKey('bar_remove', $mock->field);
+		$this->assertArrayNotHasKey('bar_current', $mock->field);
+		$this->assertArrayHasKey('baz', $mock->field);
+		$this->assertArrayNotHasKey('baz_remove', $mock->field);
+		$this->assertArrayHasKey('baz_current', $mock->field);
+		$this->assertEquals('file', $mock->field['foo']->attribute('type'));
+	}
 }