blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-10-12 15:04:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

BugFix

Browse Source
This commit is contained in:
Paminger
2016-06-20 08:36:37 +02:00
parent 377b1ecdd0
commit 68963a962a
3 changed files with 38 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/Templates.php
+9 -3
View File
@@ -119,7 +119,13 @@ class Templates extends FHC_Controller
$vorlagetext = $this->vorlagelib->getVorlagetextById($vorlagestudiengang_id); $vorlagetext = $this->vorlagelib->getVorlagetextById($vorlagestudiengang_id);
if ($vorlagetext->error) if ($vorlagetext->error)
show_error($vorlagetext->retval); show_error($vorlagetext->retval);
$this->load->view('system/templatetextEdit', $vorlagetext->retval[0]); $data = $vorlagetext->retval[0];
// Preview-Data
$schema = $this->vorlagelib->getVorlage($data->vorlage_kurzbz);
$data->schema = $schema->retval[0]->attribute;
$this->load->view('system/templatetextEdit', $data);
} }
public function saveText() public function saveText()
@@ -134,8 +140,8 @@ class Templates extends FHC_Controller
if ($vorlagetext->error) if ($vorlagetext->error)
show_error($vorlagetext->retval); show_error($vorlagetext->retval);
$data['vorlagestudiengang_id'] = $vorlagestudiengang_id; $data['vorlagestudiengang_id'] = $vorlagestudiengang_id;
//redirect('/system/Templates/editText/'.$vorlagestudiengang_id); redirect('/system/Templates/editText/'.$vorlagestudiengang_id);
$this->load->view('system/templatetextEdit', $data); //$this->load->view('system/templatetextEdit', $data);
} }
public function preview($vorlagestudiengang_id) public function preview($vorlagestudiengang_id)
application/views/system/templatetextEdit.php
+2 -2
View File
@@ -20,7 +20,7 @@ StudiengangKZ: <?=$studiengang_kz?>
</form> </form>
<hr/><h2>Preview-Data</h2> <hr/><h2>Preview-Data</h2>
<form method="post" action="../preview/<?=$vorlagestudiengang_id?>" target="TemplatePreview"> <form method="post" action="../preview/<?=$vorlagestudiengang_id?>" target="TemplatePreview">
<?php echo $this->templatelib->widget("jsonforms_widget", array('id' => 'dataform')); ?> <?php echo $this->templatelib->widget("jsonforms_widget", array('id' => 'dataform', 'schema' => $schema)); ?>
<input type="hidden" name="formdata" id="formdata" value="" /> <input type="hidden" name="formdata" id="formdata" value="" />
<button type="submit" onclick="getFormdata(this.form);">Preview</button> <button type="submit" onclick="getFormdata(this.form);">Preview</button>
</form> </form>
@@ -36,6 +36,6 @@ StudiengangKZ: <?=$studiengang_kz?>
} }
</script> </script>
<iframe name="TemplatePreview" width="100%" src="../preview/<?=$vorlagestudiengang_id?>"/> <iframe name="TemplatePreview" width="100%" src=""/>
</body> </body>
</html> </html>
application/widgets/jsonforms_widget.php
+27 -39
View File
@@ -13,47 +13,35 @@ class jsonforms_widget extends Widget
if (! isset($data['id'])) if (! isset($data['id']))
$data['id'] = 'jsonforms'; $data['id'] = 'jsonforms';
if (! isset($data['style'])) if (! isset($data['style']))
$data['style'] = 'width: 500px; height: 200px;'; $data['style'] = 'width: 50%; ';
if (! isset($data['schema'])) if (! isset($data['schema']))
$data['schema'] = '{ $data['schema'] = '{
"$schema": "http://json-schema.org/draft-03/schema#", "$schema": "http://json-schema.org/draft-03/schema#",
"title": "Person", "title": "Person",
"type": "object", "type": "object",
"properties": { "properties": {
"anrede": { "anrede": {
"type": "string", "type": "string",
"enum": [ "enum": [
"Herr", "Herr",
"Frau" "Frau"
], ],
"default": "Herr" "default": "Herr"
}, },
"vorname": { "vorname": {
"type": "string", "type": "string",
"description": "Firstname", "description": "Firstname",
"minLength": 2, "minLength": 2,
"default": "Vorname" "default": "Vorname"
}, },
"nachname": { "nachname": {
"type": "string", "type": "string",
"description": "Firstname", "description": "Surename",
"minLength": 2, "minLength": 2,
"default": "Nachname" "default": "Nachname"
}, }
"code": { }
"type": "string", }';
"description": "Accesscode",
"minLength": 6,
"default": "1q2w3e4r5t6z7u8i9o0"
},
"link": {
"type": "string",
"description": "LoginURL",
"minLength": 6,
"default": "https://cis.fhcomplete.org"
}
}
}';
$this->view('widgets/jsonforms', $data); $this->view('widgets/jsonforms', $data);
} }
} }