Merge branch 'master' of bitbucket.org:colosa/processmaker

2014-02-17 11:28:45 -04:00
parent e4330fe5d9 4205dc1f0c
commit fe5efa3f8d
5 changed files with 88 additions and 12 deletions
--- a/workflow/engine/src/Services/Api/ProcessMaker/Project.php
+++ b/workflow/engine/src/Services/Api/ProcessMaker/Project.php
@@ -425,9 +425,8 @@ class Project extends Api
     * @url GET /:prj_uid/grid/:grid_uid/variables
     *
     * @param string $prj_uid  {@min 32}{@max 32}
-     * @param string $grid_uid
     */
-    public function doGetGridVariablesByGridUid($prj_uid, $grid_uid = "")
+    public function doGetGridVariables($prj_uid, $grid_uid = "")
    {
        try {
            $process = new \BusinessModel\Process();