struct Item has modification_user_id (long) now
this is the id of a user who has modified the item recently this is only for information, persmissions don't use it git-svn-id: svn://ttmath.org/publicrep/winix/trunk@614 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
13
core/db.cpp
13
core/db.cpp
@@ -455,9 +455,10 @@ Error Db::AddItemIntoItem(Item & item)
|
||||
{
|
||||
AssertConnection();
|
||||
std::ostringstream query;
|
||||
query << "insert into core.item (user_id, group_id, privileges, date_creation, date_modification, type, "
|
||||
query << "insert into core.item (user_id, modification_user_id, group_id, privileges, date_creation, date_modification, type, "
|
||||
"parent_id, content_id, auth, auth_path, default_item, subject, guest_name, url) values (";
|
||||
query << '\'' << item.user_id << "', ";
|
||||
query << '\'' << item.modification_user_id << "', ";
|
||||
query << '\'' << item.group_id << "', ";
|
||||
query << '\'' << item.privileges << "', ";
|
||||
query << '\'' << ConvertTime(item.date_creation) << "', ";
|
||||
@@ -562,7 +563,7 @@ Error Db::EditItemInItem(Item & item, bool with_url)
|
||||
{
|
||||
AssertConnection();
|
||||
std::ostringstream query;
|
||||
query << "update core.item set (user_id, group_id, privileges, date_creation, date_modification, type, "
|
||||
query << "update core.item set (user_id, modification_user_id, group_id, privileges, date_creation, date_modification, type, "
|
||||
"default_item, parent_id, subject, guest_name, auth, auth_path";
|
||||
|
||||
if( with_url )
|
||||
@@ -570,6 +571,7 @@ Error Db::EditItemInItem(Item & item, bool with_url)
|
||||
|
||||
query << ") = (";
|
||||
query << '\'' << item.user_id << "', ";
|
||||
query << '\'' << item.modification_user_id << "', ";
|
||||
query << '\'' << item.group_id << "', ";
|
||||
query << '\'' << item.privileges << "', ";
|
||||
query << '\'' << ConvertTime(item.date_creation) << "', ";
|
||||
@@ -795,7 +797,7 @@ PGresult * Db::GetItemsQuery(const ItemQuery & iq)
|
||||
query << "select item.id";
|
||||
|
||||
if( iq.sel_parent_id ) query << " ,parent_id";
|
||||
if( iq.sel_user_id ) query << " ,user_id";
|
||||
if( iq.sel_user_id ) query << " ,user_id, modification_user_id";
|
||||
if( iq.sel_group_id ) query << " ,group_id";
|
||||
if( iq.sel_guest_name) query << " ,guest_name";
|
||||
if( iq.sel_privileges ) query << " ,privileges";
|
||||
@@ -1092,7 +1094,7 @@ bool result = false;
|
||||
AssertConnection();
|
||||
|
||||
std::ostringstream query;
|
||||
query << "select user_id, group_id, privileges, guest_name from core.item"
|
||||
query << "select user_id, modification_user_id, group_id, privileges, guest_name from core.item"
|
||||
<< " where item.id='" << id << "';";
|
||||
|
||||
r = AssertQuery( query.str() );
|
||||
@@ -1129,8 +1131,9 @@ Error Db::EditPrivById(Item & item, long id)
|
||||
{
|
||||
AssertConnection();
|
||||
std::ostringstream query;
|
||||
query << "update core.item set (user_id, group_id, privileges, guest_name) = (";
|
||||
query << "update core.item set (user_id, modification_user_id, group_id, privileges, guest_name) = (";
|
||||
query << '\'' << item.user_id << "', ";
|
||||
query << '\'' << item.modification_user_id << "', ";
|
||||
query << '\'' << item.group_id << "', ";
|
||||
query << '\'' << item.privileges << "', ";
|
||||
query << '\'' << Escape(item.guest_name) << "' ";
|
||||
|
Reference in New Issue
Block a user