diff --git a/config/repositories.json b/config/repositories.json index cc6e7bb..ebd49fc 100755 --- a/config/repositories.json +++ b/config/repositories.json @@ -103,7 +103,7 @@ "getById" ], - "state": [ + "global_state": [ "getAll" ], diff --git a/manager/module/machineDefault.php b/manager/module/machineDefault.php index 4330c14..6a876b4 100755 --- a/manager/module/machineDefault.php +++ b/manager/module/machineDefault.php @@ -380,7 +380,7 @@ /* [2] On récupère la liste des états =========================================================*/ - $statesReq = new Repo('state/getAll'); + $statesReq = new Repo('global_state/getAll'); $states = ($statesReq->error==0) ? $statesReq->answer() : []; diff --git a/manager/repo/state.php b/manager/repo/global_state.php similarity index 74% rename from manager/repo/state.php rename to manager/repo/global_state.php index 133906f..2874fb9 100644 --- a/manager/repo/state.php +++ b/manager/repo/global_state.php @@ -6,9 +6,9 @@ use \manager\ManagerError; use \manager\repo\cluster as clusterRepo; - class state extends parentRepo{ + class global_state extends parentRepo{ - protected static function table_name(){ static $table_name = 'state'; return $table_name; } + protected static function table_name(){ static $table_name = 'global_state'; return $table_name; } } diff --git a/test/client/lib-min.js b/test/client/lib-min.js index 1cbcc07..f020d9f 100644 --- a/test/client/lib-min.js +++ b/test/client/lib-min.js @@ -3,4 +3,4 @@ var Chip; Chip.prototype.getPin=function(a){if(parseInt(a)==a&&this.pin.hasOwnProperty(a))return this.pin[a]};Chip.prototype.getPins=function(){for(var a=[],b=0;b