Chris Morgan : Confusion between sAction=view and sAction= display broke viewing/displaying items. Standardize on sAction= view until we can come up with a more robust way of ensuring the same issue doesn 't happen again.

[Chris Morgan]

Module: appdb
Branch: master
Commit: a6f76eb8923c4ea76b8b153bb641c60facc0ad0b
URL:    http://source.winehq.org/git/appdb.git/?a=commit;h=a6f76eb8923c4ea76b8b153bb641c60facc0ad0b

Author: Chris Morgan <cmorgan at alum.wpi.edu>
Date:   Mon Sep 24 21:35:35 2007 -0400

Confusion between sAction=view and sAction=display broke viewing/displaying items. Standardize on sAction=view until we can come up with a more robust way of ensuring the same issue doesn't happen again.

---

 appview.php               |    2 +-
 include/application.php   |    2 +-
 include/objectManager.php |    2 +-
 include/version.php       |    4 ++--
 objectManager.php         |    4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/appview.php b/appview.php
index f154840..dc2e1f7 100644
--- a/appview.php
+++ b/appview.php
@@ -22,7 +22,7 @@ if(isset($aClean['iAppId']) || isset($aClean['iVersionId'])) // Valid args
         $oObject = new Version($aClean['iVersionId']);
 
     // header
-    apidb_header($oObject->objectGetCustomTitle("display"));
+    apidb_header($oObject->objectGetCustomTitle("view"));
 
     if(isset($aClean['iVersionId']))
         $oObject->display($aClean);
diff --git a/include/application.php b/include/application.php
index 920babe..476b5d6 100644
--- a/include/application.php
+++ b/include/application.php
@@ -670,7 +670,7 @@ class Application {
     {
         switch($sAction)
         {
-            case "display":
+            case "view":
                 return "Viewing App: ".$this->sName;
 
             default:
diff --git a/include/objectManager.php b/include/objectManager.php
index 4a09015..0aacf10 100644
--- a/include/objectManager.php
+++ b/include/objectManager.php
@@ -794,7 +794,7 @@ class ObjectManager
 
         $oObject = new $this->sClass($this->iId);
 
-        $aVars = $this->get_custom_vars($aClean, "display");
+        $aVars = $this->get_custom_vars($aClean, "view");
 
         if(!$aVars)
             $oObject->display();
diff --git a/include/version.php b/include/version.php
index c84491e..513ba1a 100644
--- a/include/version.php
+++ b/include/version.php
@@ -724,7 +724,7 @@ class version {
     {
         switch($sAction)
         {
-            case "display":
+            case "view":
                 return "Viewing App: ".version::fullName($this->iVersionId);
 
             default:
@@ -736,7 +736,7 @@ class version {
     {
         switch($sAction)
         {
-            case "display":
+            case "view":
                 /* Allow the user to select which test report is
                    shown in the version view */
                 return array("iTestingId");
diff --git a/objectManager.php b/objectManager.php
index 983726e..55bfefb 100644
--- a/objectManager.php
+++ b/objectManager.php
@@ -85,7 +85,7 @@ $sAction = $aClean['sAction'];
 if(!$sAction)
 {
     if($oObject->iId)
-        $sAction = "display";
+        $sAction = "view";
 }
 
 apidb_header($oObject->get_title($sAction));
@@ -111,7 +111,7 @@ if($oObject->iId && $sAction != "add")
         $oObject->delete_prompt();
         break;
 
-        case "display":
+        case "view":
         $oObject->view($_SERVER['REQUEST_URI'], $aClean);
         break;
     }