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

removed some thread and ticket information from request

Browse Source 
they are in FunThread and FunTicket classes now
added funtion FunUptime (I forgot about it)



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@631 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2010-08-10 20:43:38 +00:00
parent 76897b8a83
commit 9901c63ede
79 changed files with 1219 additions and 993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
functions/editticket.cpp
View File

@@ -23,6 +23,11 @@ EditTicket::EditTicket()
}
void EditTicket::Clear()
{
functions->fun_ticket.Clear();
}
bool EditTicket::HasAccess()
{
@@ -30,13 +35,15 @@ bool EditTicket::HasAccess()
if( !request->session->puser )
return false;
if( request->dir_table.empty() )
if( request->dir_tab.empty() )
return false;
if( request->is_item || !request->is_ticket )
functions->fun_ticket.ReadTicket();
if( request->is_item || !functions->fun_ticket.is_ticket )
return false;
if( !system->HasWriteAccess(*request->dir_table.back()) )
if( !system->HasWriteAccess(*request->dir_tab.back()) )
return false;
if( !system->mounts.pmount || system->mounts.pmount->type != Mount::ticket )
@@ -55,13 +62,13 @@ void EditTicket::EditTicketCheckFirstItem()
return;
if( request->ticket.item_id == -1 )
if( functions->fun_ticket.ticket.item_id == -1 )
{
// creating a new item (the item was deleted by a user)
Item item;
item.parent_id = request->dir_table.back()->id;
item.subject = request->dir_table.back()->subject;
item.parent_id = request->dir_tab.back()->id;
item.subject = request->dir_tab.back()->subject;
item.type = Item::file;
item.privileges = 0644; // !! tymczasowo
functions->SetUser(item);
@@ -72,7 +79,7 @@ void EditTicket::EditTicketCheckFirstItem()
if( request->status == WINIX_ERR_OK )
{
log << log2 << "Content: added the first item with content for the ticket, item.id: " << item.id << logend;
request->ticket.item_id = item.id;
functions->fun_ticket.ticket.item_id = item.id;
}
}
}
@@ -88,14 +95,14 @@ void EditTicket::EditTicketModTicket()
ReadTicket read_ticket;
read_ticket.Read(system, request, &ticket);
request->ticket.type = ticket.type;
request->ticket.status = ticket.status;
request->ticket.priority = ticket.priority;
request->ticket.category = ticket.category;
request->ticket.expected = ticket.expected;
request->ticket.progress = ticket.progress;
functions->fun_ticket.ticket.type = ticket.type;
functions->fun_ticket.ticket.status = ticket.status;
functions->fun_ticket.ticket.priority = ticket.priority;
functions->fun_ticket.ticket.category = ticket.category;
functions->fun_ticket.ticket.expected = ticket.expected;
functions->fun_ticket.ticket.progress = ticket.progress;
request->status = db->EditTicketById(request->ticket);
request->status = db->EditTicketById(functions->fun_ticket.ticket);
}
@@ -107,7 +114,7 @@ void EditTicket::EditTicketModDir()
// we don't modify the url
Item & dir = *request->dir_table.back();
Item & dir = *request->dir_tab.back();
bool edit_dir_subject = (dir.subject != request->item.subject);
if( edit_dir_subject )
@@ -127,7 +134,7 @@ void EditTicket::EditTicketModFirstItem()
functions->ReadItemContentWithType(request->item);
Item item;
db->GetItemById(request->ticket.item_id, item);
db->GetItemById(functions->fun_ticket.ticket.item_id, item);
item.subject = request->item.subject;
item.content = request->item.content;
item.content_type = request->item.content_type;
@@ -186,7 +193,7 @@ void EditTicket::MakePost()
return;
}
if( db->GetTicketByDirId(request->dir_table.back()->id, request->ticket) != WINIX_ERR_OK )
if( db->GetTicketByDirId(request->dir_tab.back()->id, functions->fun_ticket.ticket) != WINIX_ERR_OK )
{
request->status = WINIX_ERR_PERMISSION_DENIED;
return;
@@ -203,10 +210,10 @@ void EditTicket::MakePost()
void EditTicket::MakeGet()
{
db->GetItemById(request->ticket.item_id, request->item);
db->GetItemById(functions->fun_ticket.ticket.item_id, request->item);
// the subject we get from the last directory
request->item.subject = request->dir_table.back()->subject;
request->item.subject = request->dir_tab.back()->subject;
}