updated textmodule, better sorting, no tag menu, reload problems etc

This commit is contained in:
Ulf Gebhardt 2015-04-16 18:52:30 +02:00
parent b0c826fcad
commit 3e3ab76a03
6 changed files with 67 additions and 18 deletions

View File

@ -25,6 +25,12 @@ function text2_menu(){
$('.menu_lang_default').parent().addClass('active');}
};
function init_saimod_sys_text_notag(){
$('#tabs_text li').each(function(){
$(this).removeClass('active');});
$('#menu_tag_notag').parent().addClass('active');
}
function init_saimod_sys_text_tag(){
text_menu();
text2_menu();
@ -36,19 +42,21 @@ function init_saimod_sys_text_editor(){
init_tinymce();
$('#btn_save').click(function(){
var new_id = $('#input_new_id').val();
var lang = $(this).attr('text_lang');
$.ajax({ type :'GET',
url : './sai.php',
data : { sai_mod: '.SYSTEM.SAI.saimod_sys_text',
action: 'save',
id: $(this).attr('text_id'),
new_id: $('#input_new_id').val(),
lang: $(this).attr('text_lang'),
new_id: new_id,
lang: lang,
tags: JSON.stringify($('#input_tags').val().split(',').map(function(s) { return s.trim() })),
text: encodeURIComponent(tinyMCE.activeEditor.getContent({format : 'raw'}))},
success : function(data) {
if(data.status){
alert('success');
system.reload();
system.load('text(edittext(editor));id.'+new_id+';lang.'+lang);
}else{
alert('Problem: '+data);}
}
@ -66,7 +74,7 @@ function init_saimod_sys_text_editor(){
success : function(data) {
if(data.status){
alert('success');
system.reload();
system.load('text');
}else{
alert('Problem: '+data);}
}

View File

@ -7,11 +7,15 @@ class SYS_SAIMOD_TEXT_GETTEXTS extends \SYSTEM\DB\QP {
//pg
'',
//mys
'SELECT system_text_tag.tag, system_text.*, a.username as author_name, ae.username as author_edit_name
FROM system_text_tag
LEFT JOIN system_text ON system_text_tag.id = system_text.id
LEFT JOIN system_user as a ON system_text.author = a.id
LEFT JOIN system_user as ae ON system_text.author_edit = ae.id
WHERE tag = ?
GROUP BY id;'
'SELECT *
FROM (
SELECT system_text_tag.tag, system_text.*, a.username as author_name, ae.username as author_edit_name
FROM system_text_tag
LEFT JOIN system_text ON system_text_tag.id = system_text.id
LEFT JOIN system_user as a ON system_text.author = a.id
LEFT JOIN system_user as ae ON system_text.author_edit = ae.id
WHERE tag = ?
ORDER BY time_edit DESC
) AS sub
GROUP BY sub.id;'
);}}

View File

@ -7,10 +7,14 @@ class SYS_SAIMOD_TEXT_GETTEXTS_ALL extends \SYSTEM\DB\QQ {
//pg
'',
//mys
'SELECT system_text_tag.tag, system_text.*, a.username as author_name, ae.username as author_edit_name
FROM system_text_tag
LEFT JOIN system_text ON system_text_tag.id = system_text.id
LEFT JOIN system_user as a ON system_text.author = a.id
LEFT JOIN system_user as ae ON system_text.author_edit = ae.id
GROUP BY id;'
'SELECT *
FROM (
SELECT system_text_tag.tag, system_text.*, a.username as author_name, ae.username as author_edit_name
FROM system_text_tag
LEFT JOIN system_text ON system_text_tag.id = system_text.id
LEFT JOIN system_user as a ON system_text.author = a.id
LEFT JOIN system_user as ae ON system_text.author_edit = ae.id
ORDER BY time_edit DESC
) AS sub
GROUP BY sub.id;'
);}}

View File

@ -0,0 +1,23 @@
<?php
namespace SYSTEM\DBD;
class SYS_SAIMOD_TEXT_GETTEXTS_NOTAG extends \SYSTEM\DB\QQ {
protected static function query(){
return new \SYSTEM\DB\QQuery(get_class(),
//pg
'',
//mys
'SELECT *
FROM (
SELECT system_text.*, a.username as author_name, ae.username as author_edit_name
FROM system_text
LEFT JOIN system_user as a ON system_text.author = a.id
LEFT JOIN system_user as ae ON system_text.author_edit = ae.id
WHERE NOT EXISTS
(SELECT id
FROM system_text_tag
WHERE system_text_tag.id = system_text.id)
ORDER BY time_edit DESC
) AS sub
GROUP BY sub.id;'
);}}

View File

@ -12,6 +12,15 @@ class saimod_sys_text extends \SYSTEM\SAI\SaiModule {
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/saimod_sys_text.tpl'), $vars);
}
public static function sai_mod__SYSTEM_SAI_saimod_sys_text_action_notag(){
$res = \SYSTEM\DBD\SYS_SAIMOD_TEXT_GETTEXTS_NOTAG::QQ();
$entries = '';
while($r = $res->next()){
$entries .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/saimod_sys_text_list_entry.tpl'), $r);
}
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/saimod_sys_text_list.tpl'), array('entries' => $entries));
}
public static function sai_mod__SYSTEM_SAI_saimod_sys_text_action_tag($tag = null){
if ($tag) {
$res = \SYSTEM\DBD\SYS_SAIMOD_TEXT_GETTEXTS::QQ(array($tag));

View File

@ -4,7 +4,8 @@
<div class="tabbable">
<ul class="nav nav-tabs" id="tabs_text">
<li><a href="#!text" id="menu_tag_all">All</a></li>
${tabopts}
<li><a href="#!text(notag)" id="menu_tag_notag">No Tag</a></li>
${tabopts}
<input type="submit" value="Add" class="btn-small btn-success content_add" onClick="system.load('text(edittext(editor));id.${new_id};lang.${new_lang}');" style="margin-left: 15px; float: right;">
</ul>
<div class="tab-content" id="tab_content"></div>