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

Remove html-Tags in tabulator text

Browse Source
This commit is contained in:
ma0068
2024-01-24 09:04:53 +01:00
parent 2f5d93daa2
commit b8c885c8a4
4 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/components/stv/Notiz.php
+1 -3
View File
@@ -107,11 +107,9 @@ class Notiz extends FHC_Controller
if(isset($_POST['typeId']))
$type = $this->input->post('typeId');
//var_dump($_POST);
if(!$type)
{
$result = error('kein Type für ID vorhanden', EXIT_ERROR);
$result = error('kein Type für ID vorhanden', ERROR);
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
return $this->outputJson(getError($result));
application/models/person/Notiz_model.php
+2 -1
View File
@@ -293,7 +293,8 @@ class Notiz_model extends DB_Model
TO_CHAR (CASE
WHEN n.updateamum >= n.insertamum THEN n.updateamum
ELSE n.insertamum
END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate
END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate,
regexp_replace(n.text, '<[^>]*>', '', 'g') as text_stripped
FROM
public.tbl_notiz n
JOIN
public/js/components/Notiz/Notiz.js
+14 -3
View File
@@ -140,8 +140,19 @@ export default {
tinymce.init({
target: this.$refs.editor, //Important: not selector: to enable multiple import of component
//height: 800,
plugins: ['lists'],
toolbar: "undo redo | blocks | bold italic | alignleft aligncenter alignright alignjustify | outdent indent",
//plugins: ['lists'],
//toolbar: " blocks | bold italic underline | alignleft aligncenter alignright alignjustify",
toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify',
style_formats: [
{ title: 'Blocks', block: 'div' },
{ title: 'Paragraph', block: 'p' },
{ title: 'Heading 1', block: 'h1' },
{ title: 'Heading 2', block: 'h2' },
{ title: 'Heading 3', block: 'h3' },
{ title: 'Heading 4', block: 'h4' },
{ title: 'Heading 5', block: 'h5' },
{ title: 'Heading 6', block: 'h6' },
],
autoresize_bottom_margin: 16,
setup: (editor) => {
@@ -278,7 +289,7 @@ export default {
</form>
<!--intText: {{intText}}-->
<!-- intText: {{intText}}-->
</div>`
public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+9 -5
View File
@@ -24,15 +24,14 @@ export default {
return {
tabulatorOptions: {
ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.modelValue.person_id + '/person_id'),
//ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.modelValue.person_id + '/' + this.typeId),
//ajaxURL: CoreRESTClient._generateRouterURI('components/stv/Notiz/getNotizen/' + this.modelValue.person_id + '/' + this.formData.typeId),
columns: [
{title: "Titel", field: "titel"},
{title: "Text", field: "text", width: 350},
{title: "Text", field: "text_stripped", width: 350},
{title: "VerfasserIn", field: "verfasser_uid"},
{title: "BearbeiterIn", field: "bearbeiter_uid", visible: false},
{title: "Start", field: "start", visible: false},
{title: "Ende", field: "ende", visible: false},
/* {title: "Dokumente", field: "dms_id"},*/
{title: "Dokumente", field: "countdoc"},
{title: "Erledigt", field: "erledigt", visible: false},
{title: "Notiz_id", field: "notiz_id", visible: false},
@@ -54,8 +53,14 @@ export default {
layout: 'fitDataFill',
layoutColumnsOnNewData: false,
height: '150',
selectableRangeMode: 'click',
selectable: true,
index: 'notiz_id'
index: 'notiz_id',
/* rowClick: (e, row) => {
const notizId = row.getData().notiz_id;
console.log(notizId);
this.actionEditNotiz(notizId);
},*/
},
tabulatorEvents: [],
notizen: [],
@@ -132,7 +137,6 @@ export default {
formData.append('data', JSON.stringify(this.formData));
Object.entries(this.formData.anhang).forEach(([k, v]) => formData.append(k, v));
CoreRESTClient.post(
'components/stv/Notiz/addNewNotiz/' + this.modelValue.person_id,
formData,