* Fix program link.

This commit is contained in:
Yagami
2020-08-03 14:39:36 +08:00
parent 541526e62d
commit 5b1d63ebf5
5 changed files with 33 additions and 12 deletions

12
module/my/js/program.js Normal file
View File

@@ -0,0 +1,12 @@
$(function()
{
$('#projectList .transfer').click(function()
{
var programID = $(this).attr('data-id');
var link = createLink('program', 'ajaxGetEnterLink', "programID=" + programID);
$.post(link, function(pgmLink)
{
location.href = pgmLink;
})
}
})

View File

@@ -40,11 +40,10 @@
</thead>
<tbody>
<?php foreach($programs as $project):?>
<?php $projectLink = $this->createLink('program', 'transfer', "program=$project->id");?>
<tr class='text-center'>
<td><?php echo html::a($projectLink, $project->id);?></td>
<td><?php echo $project->id;?></td>
<td class='text-left'><?php echo $project->code;?></td>
<td class='text-left'><?php echo html::a($projectLink, $project->name);?></td>
<td class='text-left'><?php echo html::a("javascript:void(0)", $project->name, '', "class='transfer' data-id={$project->id}");?></td>
<td><?php echo $project->begin;?></td>
<td><?php echo $project->end;?></td>
<td class="c-status">

View File

@@ -609,7 +609,7 @@ class program extends control
public function ajaxGetDropMenu($programID, $module, $method, $extra)
{
$this->loadModel('project');
$this->view->link = $this->program->getProgramLink($module, $method, $extra);
$this->view->link = "javascript:void(0)";
$this->view->programID = $programID;
$this->view->module = $module;
$this->view->method = $method;

View File

@@ -170,11 +170,6 @@ class programModel extends model
return $output;
}
public function getProgramLink($module, $method, $extra)
{
return helper::createLink('program', 'transfer', "programID=%s");
}
public static function isClickable($project, $action)
{
$action = strtolower($action);

View File

@@ -23,13 +23,13 @@ foreach($programs as $program)
{
if($program->status != 'done' and $program->status != 'closed' and $program->PM == $this->app->user->account)
{
$myProgramsHtml .= html::a(sprintf($link, $program->id), "<i class='icon icon-folder-outline'></i> " . $program->name, '', "class='text-important' title='{$program->name}' data-key='" . zget($programsPinYin, $program->name, '') . "'");
$myProgramsHtml .= html::a($link, "<i class='icon icon-folder-outline'></i> " . $program->name, '', "class='text-important transfer' title='{$program->name}' data-id={$program->id} data-key='" . zget($programsPinYin, $program->name, '') . "'");
}
else if($program->status != 'done' and $program->status != 'closed' and !($program->PM == $this->app->user->account))
{
$normalProgramsHtml .= html::a(sprintf($link, $program->id), "<i class='icon icon-folder-outline'></i> " . $program->name, '', "title='{$program->name}' data-key='" . zget($programsPinYin, $program->name, '') . "'");
$normalProgramsHtml .= html::a($link, "<i class='icon icon-folder-outline'></i> " . $program->name, '', "class='transfer' title='{$program->name}' data-id={$program->id} data-key='" . zget($programsPinYin, $program->name, '') . "'");
}
else if($program->status == 'done' or $program->status == 'closed') $closedProgramsHtml .= html::a(sprintf($link, $program->id), "<i class='icon icon-folder-outline'></i> " . $program->name, '', "title='{$program->name}' data-key='" . zget($programsPinYin, $program->name, '') . "'");
else if($program->status == 'done' or $program->status == 'closed') $closedProgramsHtml .= html::a($link, "<i class='icon icon-folder-outline'></i> " . $program->name, '', "title='{$program->name}' class='transfer' data-id={$program->id} data-key='" . zget($programsPinYin, $program->name, '') . "'");
}
?>
<div class="table-row">
@@ -65,3 +65,18 @@ foreach($programs as $program)
</div>
</div>
</div>
<script>
$(function()
{
$('#swapper .transfer').click(function()
{
var programID = $(this).attr('data-id');
var link = createLink('program', 'ajaxGetEnterLink', "programID=" + programID);
$.post(link, function(pgmLink)
{
location.href = pgmLink;
})
})
})
</script>