tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

added: to Item struct: ameta (PT::Space)

Browse Source 
admin meta information
added: option "a" to meta winix function
       editing admin meta information
changed: now if you don't have write access to an item
         you can't see the meta information
         previous if you had read access you could have seen them
added: in plugin ticket and thread
       support for 'closing' (ticket, thread)
       (this is only logic, we need some html yet)
added: some ezc function for getting meta/admin meta information
       (for the current item and the last directory)




git-svn-id: svn://ttmath.org/publicrep/winix/trunk@907 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2012-11-04 21:01:02 +00:00
parent 4809016b78
commit 0045c6c72c
24 changed files with 389 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/Makefile.dep
View File

@@ -132,7 +132,7 @@ dir.o: ../functions/rm.h ../functions/rmuser.h ../functions/sort.h
dir.o: ../functions/specialdefault.h ../functions/stat.h
dir.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h
dir.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h
dir.o: ../functions/who.h ../functions/vim.h
dir.o: ../functions/who.h ../functions/vim.h miscspace.h
doc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
doc.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
doc.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h

62
templates/dir.cpp
View File

@@ -10,6 +10,7 @@
#include "templates.h"
#include "core/misc.h"
#include "functions/functions.h"
#include "miscspace.h"
namespace TemplatesFunctions
@@ -432,14 +433,71 @@ void dir_last_has_html_template(Info & i)
}
void dir_last_meta_str(Info & i)
{
cur->request->dir_tab.back()->meta.Serialize(i.out, true, false);
}
void dir_last_meta(Info & i)
{
space(i, cur->request->dir_tab.back()->meta);
}
void dir_last_meta_tab(Info & i)
{
spaces_tab(i, cur->request->dir_tab.back()->meta);
}
void dir_last_meta_tab_value(Info & i)
{
spaces_tab_value(i, cur->request->dir_tab.back()->meta);
}
void dir_last_meta_tab_has_next(Info & i)
{
spaces_tab_has_next(i, cur->request->dir_tab.back()->meta);
}
void dir_last_admin_meta_str(Info & i)
{
cur->request->dir_tab.back()->ameta.Serialize(i.out, true, false);
}
void dir_last_admin_meta(Info & i)
{
space(i, cur->request->dir_tab.back()->ameta);
}
void dir_last_admin_meta_tab(Info & i)
{
spaces_tab(i, cur->request->dir_tab.back()->ameta);
}
void dir_last_admin_meta_tab_value(Info & i)
{
spaces_tab_value(i, cur->request->dir_tab.back()->ameta);
}
void dir_last_admin_meta_tab_has_next(Info & i)
{
spaces_tab_has_next(i, cur->request->dir_tab.back()->ameta);
}
} // namespace TemplatesFunctions

36
templates/item.cpp
View File

@@ -393,10 +393,12 @@ void item_meta_str(Info & i)
void item_meta(Info & i)
{
space(i, cur->request->last_item->meta);
space(i, cur->request->last_item->meta); // !! a new interface (last_item instead of item)
}
void item_meta_tab(Info & i)
{
spaces_tab(i, cur->request->last_item->meta);
@@ -418,6 +420,38 @@ void item_meta_tab_has_next(Info & i)
void item_admin_meta_str(Info & i)
{
cur->request->item.ameta.Serialize(i.out, true, false);
}
void item_admin_meta(Info & i)
{
space(i, cur->request->last_item->ameta);
}
void item_admin_meta_tab(Info & i)
{
spaces_tab(i, cur->request->last_item->ameta);
}
void item_admin_meta_tab_value(Info & i)
{
spaces_tab_value(i, cur->request->last_item->ameta);
}
void item_admin_meta_tab_has_next(Info & i)
{
spaces_tab_has_next(i, cur->request->last_item->ameta);
}
static size_t item_index;

53
templates/templates.cpp
View File

@@ -225,8 +225,36 @@ void Templates::CreateFunctions()
ezc_functions.Insert("dir_last_html_template", dir_last_html_template);
ezc_functions.Insert("dir_last_has_html_template", dir_last_has_html_template);
ezc_functions.Insert("dir_last_meta_str", dir_last_meta_str);
ezc_functions.Insert("dir_last_meta", dir_last_meta);
ezc_functions.Insert("dir_last_meta_tab", dir_last_meta_tab);
ezc_functions.Insert("dir_last_meta_tab_value", dir_last_meta_tab_value);
ezc_functions.Insert("dir_last_meta_tab_has_next", dir_last_meta_tab_has_next);
ezc_functions.Insert("dir_last_admin_meta_str", dir_last_admin_meta_str);
ezc_functions.Insert("dir_last_admin_meta", dir_last_admin_meta);
ezc_functions.Insert("dir_last_admin_meta_tab", dir_last_admin_meta_tab);
ezc_functions.Insert("dir_last_admin_meta_tab_value", dir_last_admin_meta_tab_value);
ezc_functions.Insert("dir_last_admin_meta_tab_has_next", dir_last_admin_meta_tab_has_next);
/*
doc
*/
ezc_functions.Insert("doc_title", doc_title);
ezc_functions.Insert("doc_proto", doc_proto);
ezc_functions.Insert("doc_proto_static", doc_proto_static);
ezc_functions.Insert("doc_proto_common", doc_proto_common);
ezc_functions.Insert("doc_base_url", doc_base_url);
ezc_functions.Insert("doc_base_url_static", doc_base_url_static);
ezc_functions.Insert("doc_base_url_common", doc_base_url_common);
ezc_functions.Insert("doc_current_url", doc_current_url);
ezc_functions.Insert("doc_css_tab", doc_css_tab);
ezc_functions.Insert("doc_css_tab_file", doc_css_tab_file);
ezc_functions.Insert("doc_css_tab_file_is_global", doc_css_tab_file_is_global);
ezc_functions.Insert("doc_css_tab_has_next", doc_css_tab_has_next);
ezc_functions.Insert("doc_css_is_empty", doc_css_is_empty);
ezc_functions.Insert("doc_css_is_one", doc_css_is_one);
ezc_functions.Insert("doc_css_more_than_one", doc_css_more_than_one);
/*
env
*/
@@ -253,26 +281,6 @@ void Templates::CreateFunctions()
ezc_functions.Insert("fil_new_line_to_br", fil_new_line_to_br);
/*
doc
*/
ezc_functions.Insert("doc_title", doc_title);
ezc_functions.Insert("doc_proto", doc_proto);
ezc_functions.Insert("doc_proto_static", doc_proto_static);
ezc_functions.Insert("doc_proto_common", doc_proto_common);
ezc_functions.Insert("doc_base_url", doc_base_url);
ezc_functions.Insert("doc_base_url_static", doc_base_url_static);
ezc_functions.Insert("doc_base_url_common", doc_base_url_common);
ezc_functions.Insert("doc_current_url", doc_current_url);
ezc_functions.Insert("doc_css_tab", doc_css_tab);
ezc_functions.Insert("doc_css_tab_file", doc_css_tab_file);
ezc_functions.Insert("doc_css_tab_file_is_global", doc_css_tab_file_is_global);
ezc_functions.Insert("doc_css_tab_has_next", doc_css_tab_has_next);
ezc_functions.Insert("doc_css_is_empty", doc_css_is_empty);
ezc_functions.Insert("doc_css_is_one", doc_css_is_one);
ezc_functions.Insert("doc_css_more_than_one", doc_css_more_than_one);
/*
insert
*/
@@ -345,6 +353,11 @@ void Templates::CreateFunctions()
ezc_functions.Insert("item_meta_tab", item_meta_tab);
ezc_functions.Insert("item_meta_tab_value", item_meta_tab_value);
ezc_functions.Insert("item_meta_tab_has_next", item_meta_tab_has_next);
ezc_functions.Insert("item_admin_meta_str", item_admin_meta_str);
ezc_functions.Insert("item_admin_meta", item_admin_meta);
ezc_functions.Insert("item_admin_meta_tab", item_admin_meta_tab);
ezc_functions.Insert("item_admin_meta_tab_value", item_admin_meta_tab_value);
ezc_functions.Insert("item_admin_meta_tab_has_next", item_admin_meta_tab_has_next);
ezc_functions.Insert("item_tab", item_tab);
ezc_functions.Insert("item_tab_index", item_tab_index);

14
templates/templates.h
View File

@@ -135,6 +135,15 @@ namespace TemplatesFunctions
void dir_last_html_template(Info & i);
void dir_last_has_html_template(Info & i);
void dir_last_meta_str(Info & i);
void dir_last_meta(Info & i);
void dir_last_meta_tab(Info & i);
void dir_last_meta_tab_value(Info & i);
void dir_last_meta_tab_has_next(Info & i);
void dir_last_admin_meta_str(Info & i);
void dir_last_admin_meta(Info & i);
void dir_last_admin_meta_tab(Info & i);
void dir_last_admin_meta_tab_value(Info & i);
void dir_last_admin_meta_tab_has_next(Info & i);
/*
@@ -256,6 +265,11 @@ namespace TemplatesFunctions
void item_meta_tab(Info & i);
void item_meta_tab_value(Info & i);
void item_meta_tab_has_next(Info & i);
void item_admin_meta_str(Info & i);
void item_admin_meta(Info & i);
void item_admin_meta_tab(Info & i);
void item_admin_meta_tab_value(Info & i);
void item_admin_meta_tab_has_next(Info & i);
void item_tab(Info & i);
void item_tab_index(Info & i);