BUG: refs #0377. Passing numbers in scientific notation to javascript…

… fails
midasplatform · Jan 10, 2012 · f00c4b2 · f00c4b2
1 parent f78ceae
commit f00c4b2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/modules/sizequota/Notification.php b/modules/sizequota/Notification.php
@@ -87,7 +87,7 @@ public function getSimpleuploadExtraHtml($args)
       }
     else
       {
-      $freeSpace = $quota->getQuota() - $folderModel->getSize($rootFolder);
+      $freeSpace = number_format($quota->getQuota() - $folderModel->getSize($rootFolder), 0, '.', '');
       return '<div id="sizequotaFreeSpace" style="display:none;">'.$freeSpace.'</div>';
       }
     }

diff --git a/modules/sizequota/controllers/ConfigController.php b/modules/sizequota/controllers/ConfigController.php
@@ -117,8 +117,7 @@ public function folderAction()
       $formArray['quota']->setValue($currentQuota->getQuota());
       $this->view->quota = $currentQuota->getQuota();
       }
-    $usedSpace = $this->Folder->getSize($folder);
-    $this->view->usedSpace = $usedSpace[0]->size;
+    $this->view->usedSpace = $this->Folder->getSize($folder);
     $this->view->hUsedSpace = UtilityComponent::formatSize($this->view->usedSpace);
     if($this->view->quota == '')
       {
@@ -189,7 +188,7 @@ public function getfreespaceAction()
       }
     else
       {
-      $freeSpace = $quota->getQuota() - $this->Folder->getSize($rootFolder);
+      $freeSpace = number_format($quota->getQuota() - $this->Folder->getSize($rootFolder), 0, '.', '');
       }
     echo JsonComponent::encode(array('status' => true, 'freeSpace' => $freeSpace));
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -87,7 +87,7 @@ public function getSimpleuploadExtraHtml($args) @@
           }
         else
           {
-          $freeSpace = $quota->getQuota() - $folderModel->getSize($rootFolder);
+          $freeSpace = number_format($quota->getQuota() - $folderModel->getSize($rootFolder), 0, '.', '');
           return '<div id="sizequotaFreeSpace" style="display:none;">'.$freeSpace.'</div>';
           }
         }
@@ Expand Down @@