Browse Source

Fixes

master
M@dD3n 2 years ago
parent
commit
3314480b2a
  1. 2
      admin/navigation.php
  2. 2
      admin/request.php
  3. 2
      admin/templates/blocks/form.tpl
  4. 2
      admin/templates/navigation/template.tpl
  5. 4
      admin/templates/request/form.tpl
  6. 2
      admin/templates/sysblocks/form.tpl
  7. 8
      class/class.blocks.php
  8. 8
      lib/debug/debug.tpl

2
admin/navigation.php

@ -59,7 +59,7 @@
{ {
require(BASE_DIR . '/class/class.user.php'); require(BASE_DIR . '/class/class.user.php');
$AVE_User = new AVE_User; $AVE_User = new AVE_User;
$AVE_Navigation->navigationEdit((int)$_REQUEST['navigation_id']); $AVE_Navigation->navigationEdit($_REQUEST['navigation_id']);
} }
break; break;

2
admin/request.php

@ -43,7 +43,7 @@
if(check_permission_acp('request_edit')) if(check_permission_acp('request_edit'))
{ {
$AVE_Rubric->rubricTemplateShow(0, 1); $AVE_Rubric->rubricTemplateShow(0, 1);
$AVE_Request->requestEdit((int)$_REQUEST['Id']); $AVE_Request->requestEdit($_REQUEST['Id']);
} }
break; break;

2
admin/templates/blocks/form.tpl

@ -87,7 +87,7 @@
<div class="rowElem" id="saveBtn"> <div class="rowElem" id="saveBtn">
<div class="saveBtn"> <div class="saveBtn">
{if $smarty.request.id != ''} {if $smarty.request.id != ''}
<input type="hidden" name="id" value="{$id}"> <input type="hidden" name="id" value="{$sid}">
<input name="submit" type="submit" class="basicBtn" value="{#BLOCK_SAVEDIT#}" /> <input name="submit" type="submit" class="basicBtn" value="{#BLOCK_SAVEDIT#}" />
{else} {else}
<input name="submit" type="submit" class="basicBtn" value="{#BLOCK_SAVE#}" /> <input name="submit" type="submit" class="basicBtn" value="{#BLOCK_SAVE#}" />

2
admin/templates/navigation/template.tpl

@ -43,7 +43,7 @@
<a class="basicNum topDir" href="index.php?do=navigation&cp={$sess}">{#NAVI_RETURN_TO_LIST#}</a> <a class="basicNum topDir" href="index.php?do=navigation&cp={$sess}">{#NAVI_RETURN_TO_LIST#}</a>
</div> </div>
<div class="num"> <div class="num">
<a class="greenNum" href="index.php?do=navigation&action=entries&navigation_id={$smarty.request.navigation_id}&cp={$sess}">{#NAVI_EDIT_ITEMS#}</a> <a class="greenNum" href="index.php?do=navigation&action=entries&navigation_id={$nid}&cp={$sess}">{#NAVI_EDIT_ITEMS#}</a>
</div> </div>
</div> </div>

4
admin/templates/request/form.tpl

@ -13,7 +13,7 @@ function changeRub(select) {ldelim}
{if $smarty.request.action=='new'} {if $smarty.request.action=='new'}
location.href='index.php?do=request&action=new&rubric_id=' + select.options[select.selectedIndex].value + '{if $smarty.request.request_title_new!=''}&request_title_new={$smarty.request.request_title_new|escape|stripslashes}{/if}'; location.href='index.php?do=request&action=new&rubric_id=' + select.options[select.selectedIndex].value + '{if $smarty.request.request_title_new!=''}&request_title_new={$smarty.request.request_title_new|escape|stripslashes}{/if}';
{else} {else}
location.href='index.php?do=request&action=edit&Id={$smarty.request.Id|escape}&rubric_id=' + select.options[select.selectedIndex].value; location.href='index.php?do=request&action=edit&Id={$rid}&rubric_id=' + select.options[select.selectedIndex].value;
{/if} {/if}
{rdelim} {rdelim}
@ -29,7 +29,7 @@ function changeRub(select) {ldelim}
<div class="title"> <div class="title">
<h5>{#REQUEST_EDIT2#}</h5> <h5>{#REQUEST_EDIT2#}</h5>
<div class="num"> <div class="num">
<a class="basicNum" href="index.php?do=request&action=conditions&Id={$smarty.request.Id|escape}&rubric_id={$smarty.request.rubric_id|escape}&cp={$sess}">{#REQUEST_CONDITION_EDIT#}</a> <a class="basicNum" href="index.php?do=request&action=conditions&Id={$rid}&rubric_id={$smarty.request.rubric_id|escape}&cp={$sess}">{#REQUEST_CONDITION_EDIT#}</a>
</div> </div>
</div> </div>
<div class="widget" style="margin-top: 0px;"> <div class="widget" style="margin-top: 0px;">

2
admin/templates/sysblocks/form.tpl

@ -228,7 +228,7 @@
<div class="rowElem" id="saveBtn"> <div class="rowElem" id="saveBtn">
<div class="saveBtn"> <div class="saveBtn">
{if $smarty.request.id != ''} {if $smarty.request.id != ''}
<input type="hidden" name="id" value="{$id}"> <input type="hidden" name="id" value="{$sid}">
<input name="submit" type="submit" class="basicBtn" value="{#SYSBLOCK_SAVEDIT#}" /> <input name="submit" type="submit" class="basicBtn" value="{#SYSBLOCK_SAVEDIT#}" />
{else} {else}
<input name="submit" type="submit" class="basicBtn" value="{#SYSBLOCK_SAVE#}" /> <input name="submit" type="submit" class="basicBtn" value="{#SYSBLOCK_SAVE#}" />

8
class/class.blocks.php

@ -70,7 +70,7 @@
* *
* @param int $block_id идентификатор системного блока * @param int $block_id идентификатор системного блока
*/ */
function blockSave($block_id = null) function blockSave ($block_id = null)
{ {
global $AVE_DB, $AVE_Template; global $AVE_DB, $AVE_Template;
@ -156,7 +156,7 @@
* *
* @param int $block_id идентификатор системного блока * @param int $block_id идентификатор системного блока
*/ */
function blockEdit($block_id) function blockEdit ($block_id)
{ {
global $AVE_DB, $AVE_Template; global $AVE_DB, $AVE_Template;
@ -167,9 +167,11 @@
" . PREFIX . "_blocks " . PREFIX . "_blocks
WHERE WHERE
id = '" . $block_id . "' id = '" . $block_id . "'
OR
block_alias = '" . $block_id . "'
")->FetchAssocArray(); ")->FetchAssocArray();
$AVE_Template->assign('sid', $block_id); $AVE_Template->assign('sid', $row['id']);
$oCKeditor = new CKeditor(); $oCKeditor = new CKeditor();
$oCKeditor->returnOutput = true; $oCKeditor->returnOutput = true;

8
lib/debug/debug.tpl

@ -0,0 +1,8 @@
{foreach from=$edit item=group key=title}
<strong>{$title}</strong>
<ul>
{foreach from=$group item=item key=id}
<li>ID: {$id} - <a href="{$item}" target="_blank">Редактировать</a></li>
{/foreach}
</ul>
{/foreach}
Loading…
Cancel
Save