* Modify the button to edit project.

module/program/view/browsebylist.html.php

@@ -96,7 +96,7 @@
             </ul>
           </div>
           <?php endif;?>
-          <?php common::printIcon('project', 'edit', "projectID=$program->id&from=browse", $program, 'list', 'edit', '', '', '', "data-app='project'", '', $program->id);?>
+          <?php common::printIcon('project', 'edit', "projectID=$program->id", $program, 'list', 'edit', '', 'iframe', true, '', '', $program->id);?>
           <?php common::printIcon('project', 'manageMembers', "projectID=$program->id", $program, 'list', 'group', '', '', '', 'data-app="project"', '', $program->id);?>
           <?php common::printIcon('project', 'group',         "projectID=$program->id", $program, 'list', 'lock', '', '', '', 'data-app="project"', '', $program->id);?>
           <?php if(common::hasPriv('project', 'manageProducts') || common::hasPriv('project', 'whitelist') || common::hasPriv('project', 'delete')):?>

module/project/control.php

@@ -388,7 +388,7 @@ class project extends control
      * @access public
      * @return void
      */
-    public function edit($projectID = 0, $from = 'project')
+    public function edit($projectID = 0)
     {
         $this->loadModel('action');
         $this->loadModel('custom');
@@ -426,10 +426,9 @@ class project extends control
                 $this->loadModel('productplan')->linkProject($projectID, $_POST['plans'], $oldPlanStories);
             }
 
+            if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
+
             $locateLink = $this->session->projectList ? $this->session->projectList : inLink('view', "projectID=$projectID");
-            if($from == 'projectView')    $locateLink = $this->createLink('project', 'view', "projectID=$projectID");
-            if($from == 'program')        $locateLink = $this->createLink('program', 'browse');
-            if($from == 'programProject') $locateLink = $this->session->programProject ? $this->session->programProject : $this->createLink('program', 'project', "projectID=$projectID");
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink));
         }
 
@@ -472,7 +471,6 @@ class project extends control
         $this->view->unmodifiableProducts = $unmodifiableProducts;
         $this->view->branchGroups         = $this->loadModel('branch')->getByProducts(array_keys($linkedProducts), '', $linkedBranches);
         $this->view->URSRPairs            = $this->custom->getURSRPairs();
-        $this->view->from                 = $from;
         $this->view->parentProject        = $parentProject;
         $this->view->parentProgram        = $this->program->getByID($project->parent);
         $this->view->availableBudget      = $this->program->getBudgetLeft($parentProject) + (float)$project->budget;

module/project/model.php

@@ -1373,8 +1373,10 @@ class projectModel extends model
                         echo "</div>";
                     }
 
-                    $from    = $project->from == 'project' ? 'project' : 'pgmproject';
+                    $from     = $project->from == 'project' ? 'project' : 'pgmproject';
-                    common::printIcon('project', 'edit', "projectID=$project->id&from=$from", $project, 'list', 'edit', '', '', '', "data-app=project", '', $project->id);
+                    $iframe   = $this->app->openApp == 'program' ? 'iframe' : '';
+                    $onlyBody = $this->app->openApp == 'program' ? true : '';
+                    common::printIcon('project', 'edit', "projectID=$project->id", $project, 'list', 'edit', '', $iframe, $onlyBody, "data-app=project", '', $project->id);
                     common::printIcon('project', 'manageMembers', "projectID=$project->id", $project, 'list', 'group', '', '', '', "data-app=project", $this->lang->execution->team, $project->id);
                     if($this->config->systemMode == 'new') common::printIcon('project', 'group', "projectID=$project->id&programID=$programID", $project, 'list', 'lock', '', '', '', "data-app=project", '', $project->id);
 

module/project/view/edit.html.php

@@ -18,7 +18,6 @@
 <?php js::set('oldParent', $project->parent);?>
 <?php js::set('projectID', $project->id);?>
 <?php js::set('longTime', $lang->project->longTime);?>
-<?php js::set('from', $from);?>
 <?php js::set('unmodifiableProducts', $unmodifiableProducts)?>
 <?php js::set('tip', $lang->project->notAllowRemoveProducts);?>
 <?php js::set('linkedProjectsTip', $lang->project->linkedProjectsTip);?>
@@ -161,7 +160,7 @@
               echo html::hidden('model', $project->model);
               echo html::submitButton();
               $browseLink = $this->session->projectList ? $this->session->projectList : $this->createLink('project', 'browse');
-              echo html::a($browseLink, $lang->goback, '', 'class="btn btn-back btn-wide"');
+              echo isonlybody() ? html::backButton() : html::a($browseLink, $lang->goback, '', 'class="btn btn-back btn-wide"');
             ?>
           </td>
         </tr>

module/project/view/view.html.php

@@ -104,7 +104,7 @@
             echo $this->buildOperateMenu($project, 'view');
 
             echo "<div class='divider'></div>";
-            common::printIcon('project', 'edit', $params . '&from=projectView', $project, 'button', 'edit', '', '', '', '', $lang->edit);
+            common::printIcon('project', 'edit', $params, $project, 'button', 'edit', '', '', '', '', $lang->edit);
             common::printIcon('project', 'delete', $params, $project, 'button', 'trash', 'hiddenwin', '', '', '', $lang->delete);
         }
         ?>