*** empty log message ***
This commit is contained in:
parent
3e6af4880e
commit
4a9865e9ca
3 changed files with 5 additions and 4 deletions
|
@ -264,9 +264,9 @@ class uiHandler extends uiBase {
|
||||||
function editMetaData(&$formdata)
|
function editMetaData(&$formdata)
|
||||||
{
|
{
|
||||||
include dirname(__FILE__).'/formmask/metadata.inc.php';
|
include dirname(__FILE__).'/formmask/metadata.inc.php';
|
||||||
$this->redirUrl = UI_BROWSER."?act=editItem&id=$id&curr_langid=".$formdata['target_langid'];
|
|
||||||
$id = $formdata['id'];
|
$id = $formdata['id'];
|
||||||
$curr_langid = $formdata['curr_langid'];
|
$curr_langid = $formdata['curr_langid'];
|
||||||
|
$this->redirUrl = UI_BROWSER."?act=editItem&id=$id&curr_langid=".$formdata['target_langid'];
|
||||||
|
|
||||||
foreach ($mask['pages'] as $key=>$val) {
|
foreach ($mask['pages'] as $key=>$val) {
|
||||||
foreach ($mask['pages'][$key] as $k=>$v) {
|
foreach ($mask['pages'][$key] as $k=>$v) {
|
||||||
|
|
|
@ -398,10 +398,10 @@ class uiPlaylist
|
||||||
function editMetaData(&$formdata)
|
function editMetaData(&$formdata)
|
||||||
{
|
{
|
||||||
include dirname(__FILE__).'/formmask/metadata.inc.php';
|
include dirname(__FILE__).'/formmask/metadata.inc.php';
|
||||||
$this->Base->redirUrl = UI_BROWSER."?act=PL.editMetaData&id=$id&curr_langid=".$formdata['target_langid'];
|
|
||||||
$id = $this->activeId;
|
$id = $this->activeId;
|
||||||
$curr_langid = $formdata['curr_langid'];
|
$curr_langid = $formdata['curr_langid'];
|
||||||
|
$this->Base->redirUrl = UI_BROWSER."?act=PL.editMetaData&id=$id&curr_langid=".$formdata['target_langid'];
|
||||||
|
|
||||||
foreach ($mask['playlist'] as $k=>$v) {
|
foreach ($mask['playlist'] as $k=>$v) {
|
||||||
$formdata[$this->Base->_formElementEncode($v['element'])] ? $mData[$this->Base->_formElementDecode($v['element'])] = $formdata[$this->Base->_formElementEncode($v['element'])] : NULL;
|
$formdata[$this->Base->_formElementEncode($v['element'])] ? $mData[$this->Base->_formElementDecode($v['element'])] = $formdata[$this->Base->_formElementEncode($v['element'])] : NULL;
|
||||||
}
|
}
|
||||||
|
|
|
@ -269,7 +269,8 @@ class uiScheduler extends uiCalendar
|
||||||
$pl = current($pl);
|
$pl = current($pl);
|
||||||
$offset = strftime('%H:%M:%S', $this->_strtotime($datetime) - $this->_datetime2timestamp($pl['start']) - UI_TIMEZONEOFFSET);
|
$offset = strftime('%H:%M:%S', $this->_strtotime($datetime) - $this->_datetime2timestamp($pl['start']) - UI_TIMEZONEOFFSET);
|
||||||
$clip = $this->Base->gb->displayPlaylistClipAtOffset($this->Base->sessid, $pl['playlistId'], $offset, $distance);
|
$clip = $this->Base->gb->displayPlaylistClipAtOffset($this->Base->sessid, $pl['playlistId'], $offset, $distance);
|
||||||
|
if(!$clip['gunid'])
|
||||||
|
return FALSE;
|
||||||
return array(
|
return array(
|
||||||
'title' => $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($clip['gunid']), UI_MDATA_KEY_TITLE),
|
'title' => $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($clip['gunid']), UI_MDATA_KEY_TITLE),
|
||||||
'duration' => $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($clip['gunid']), UI_MDATA_KEY_DURATION),
|
'duration' => $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($clip['gunid']), UI_MDATA_KEY_DURATION),
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue