Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #56 from radiorabe/feature/version-reporting

Browse source 
Harmonize version reporting in ui and api
This commit is contained in:
Robb 2017-03-11 19:06:28 -05:00 • committed by GitHub
commit ff83784864
8 changed files with 23 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

15
airtime_mvc/application/models/Preference.php
View file

@ -865,23 +865,12 @@ class Application_Model_Preference
self::setValue("schema_version", $version);
}
public static function GetAirtimeVersion()
{
if (defined('APPLICATION_ENV') && APPLICATION_ENV == "development" && function_exists('exec')) {
$version = exec("git rev-parse --short HEAD 2>/dev/null", $out, $return_code);
if ($return_code == 0) {
return self::getValue("system_version")."+".$version.":".time();
}
}
return self::getValue("system_version");
}
public static function GetLatestVersion()
{
$config = Config::getConfig();
$latest = self::getValue("latest_version");
if ($latest == null || strlen($latest) == 0) {
return self::GetAirtimeVersion();
return $config['airtime_version'];
} else {
return $latest;
}