Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* The judgment logic of pop-up window is changed to isInModal function.

Browse Source
This commit is contained in:
tianshujie
2023-11-03 11:10:01 +08:00
parent f5564ebc9a
commit 0ea063425b
24 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+5 -5
View File
@@ -1675,10 +1675,10 @@ EOF;
*/
public static function buildIconButton($module, $method, $vars = '', $object = '', $type = 'button', $icon = '', $target = '', $extraClass = '', $onlyBody = false, $misc = '', $title = '', $programID = 0, $extraEnabled = '')
{
if(isonlybody() and strpos($extraClass, 'showinonlybody') === false) return false;
if(isInModal() and strpos($extraClass, 'showinonlybody') === false) return false;
/* Remove iframe for operation button in modal. Prevent pop up in modal. */
if(isonlybody() and strpos($extraClass, 'showinonlybody') !== false) $extraClass = str_replace('iframe', '', $extraClass);
if(isInModal() and strpos($extraClass, 'showinonlybody') !== false) $extraClass = str_replace('iframe', '', $extraClass);
global $app, $lang, $config;
@@ -1903,7 +1903,7 @@ EOF;
public static function printRPN($backLink, $preAndNext = '', $linkTemplate = '')
{
global $lang, $app;
if(isonlybody()) return false;
if(isInModal()) return false;
$title = $lang->goback . $lang->backShortcutKey;
echo html::a($backLink, '<i class="icon-goback icon-back icon-large"></i>', '', "id='back' class='btn' title={$title}");
@@ -1939,7 +1939,7 @@ EOF;
public static function printBack($backLink, $class = '', $misc = '')
{
global $lang, $app;
if(isonlybody()) return false;
if(isInModal()) return false;
if(empty($class)) $class = 'btn';
$title = $lang->goback . $lang->backShortcutKey;
@@ -1958,7 +1958,7 @@ EOF;
public static function printPreAndNext($preAndNext = '', $linkTemplate = '')
{
global $lang, $app;
if(isonlybody()) return false;
if(isInModal()) return false;
$moduleName = ($app->getModuleName() == 'story' and $app->tab == 'project') ? 'projectstory' : $app->getModuleName();
echo "<nav class='container'>";