added: to templates: an interface for getting information from Space
miscspace.h, miscspace.cpp changed: plugin ticket now as a config we use a PT::Space struct (not finished yet, only 'integer', 'select' and 'progress' are done) git-svn-id: svn://ttmath.org/publicrep/winix/trunk@794 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
* This file is a part of Winix
|
||||
* and is not publicly distributed
|
||||
*
|
||||
* Copyright (c) 2008-2010, Tomasz Sowa
|
||||
* Copyright (c) 2008-2012, Tomasz Sowa
|
||||
* All rights reserved.
|
||||
*
|
||||
*/
|
||||
@@ -47,7 +47,7 @@ bool EditTicket::HasAccess()
|
||||
if( !cur->request->is_item || !system->HasWriteAccess(cur->request->item) )
|
||||
return false;
|
||||
|
||||
if( !system->mounts.pmount || system->mounts.pmount->type != ticket_info->mount_type_ticket )
|
||||
if( cur->mount->type != ticket_info->mount_type_ticket )
|
||||
return false;
|
||||
|
||||
return true;
|
||||
@@ -98,6 +98,8 @@ void EditTicket::Submit(Ticket & ticket, Item & item)
|
||||
{
|
||||
log << log1 << "EditTicket: problem with editing a ticket, error code: "
|
||||
<< cur->request->status << logend;
|
||||
|
||||
// !! add session log
|
||||
}
|
||||
}
|
||||
|
||||
@@ -111,7 +113,7 @@ void EditTicket::RemoveTmpTicket()
|
||||
|
||||
long file_id = cur->request->item.id;
|
||||
session_data->edit_ticket_map.erase(file_id);
|
||||
session_data->new_file_map.erase(file_id);
|
||||
session_data->edit_file_map.erase(file_id);
|
||||
}
|
||||
|
||||
|
||||
@@ -141,7 +143,7 @@ std::vector<long> & EditTicket::PrepareFileMap()
|
||||
cur->session->plugin_data.Get(ticket_info->plugin_id) );
|
||||
|
||||
long file_id = cur->request->item.id;
|
||||
std::vector<long> & file_map = session_data->GetFileTab(file_id, session_data->new_file_map);
|
||||
std::vector<long> & file_map = session_data->GetFileTab(file_id, session_data->edit_file_map);
|
||||
|
||||
return file_map;
|
||||
}
|
||||
@@ -149,6 +151,7 @@ return file_map;
|
||||
|
||||
void EditTicket::MakePost()
|
||||
{
|
||||
ticket_info->Clear();
|
||||
ticket_info->FindCurrentConf();
|
||||
|
||||
Ticket & ticket = PrepareTicket();
|
||||
@@ -156,8 +159,9 @@ void EditTicket::MakePost()
|
||||
old_url = item.url;
|
||||
std::vector<long> & file_map = PrepareFileMap();
|
||||
ticket_info->ticket = &ticket;
|
||||
ticket_info->item = &item;
|
||||
|
||||
ticket_info->ReadTicketParams(ticket, false, &file_map);
|
||||
ticket_info->ReadTicketParams(ticket, false, file_map, item.meta);
|
||||
functions->ReadItem(item, Item::file);
|
||||
|
||||
if( !cur->request->IsPostVar(L"fileuploadsubmit") )
|
||||
@@ -168,10 +172,12 @@ void EditTicket::MakePost()
|
||||
|
||||
void EditTicket::MakeGet()
|
||||
{
|
||||
ticket_info->Clear();
|
||||
ticket_info->FindCurrentConf();
|
||||
|
||||
Ticket & ticket = PrepareTicket();
|
||||
ticket_info->ticket = &ticket;
|
||||
ticket_info->item = &cur->request->item;
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user