diff --git a/module/build/js/create.js b/module/build/js/create.js index 6bb0d9337b..869403068c 100644 --- a/module/build/js/create.js +++ b/module/build/js/create.js @@ -16,9 +16,9 @@ $().ready(function() }); }); - $('input[name=type]').change(function() + $('input[name=isIntegrated]').change(function() { - if($(this).val() == 'execution') + if($(this).val() == 'no') { $('#execution').closest('tr').show(); $('#buildBox').closest('tr').hide(); diff --git a/module/build/lang/de.php b/module/build/lang/de.php index b6987753bd..69448c9a5c 100644 --- a/module/build/lang/de.php +++ b/module/build/lang/de.php @@ -33,7 +33,7 @@ $lang->build->project = 'Project'; $lang->build->branch = 'Platform/Branch'; $lang->build->branchName = '%s'; $lang->build->execution = $lang->executionCommon; -$lang->build->type = 'Type'; +$lang->build->integrated = 'Integrated'; $lang->build->builds = 'Linked Builds'; $lang->build->name = 'Name'; $lang->build->date = 'Datum'; @@ -75,6 +75,6 @@ $lang->backhome = 'zurück'; $lang->build->featureBar['browse']['all'] = 'Build List'; -$lang->build->typeList = array(); -$lang->build->typeList['execution'] = "{$lang->executionCommon}版本"; -$lang->build->typeList['project'] = '项目版本'; +$lang->build->isIntegrated = array(); +$lang->build->isIntegrated['no'] = 'No'; +$lang->build->isIntegrated['yes'] = 'Yes'; diff --git a/module/build/lang/en.php b/module/build/lang/en.php index 9a1e7727cc..def8fc03ef 100644 --- a/module/build/lang/en.php +++ b/module/build/lang/en.php @@ -33,8 +33,8 @@ $lang->build->project = 'Project'; $lang->build->branch = 'Platform/Branch'; $lang->build->branchName = '%s'; $lang->build->execution = $lang->executionCommon; +$lang->build->integrated = 'Integrated'; $lang->build->builds = 'Linked Builds'; -$lang->build->type = 'Type'; $lang->build->name = 'Name'; $lang->build->date = 'Date'; $lang->build->builder = 'Builder'; @@ -75,6 +75,6 @@ $lang->backhome = 'back'; $lang->build->featureBar['browse']['all'] = 'Build List'; -$lang->build->typeList = array(); -$lang->build->typeList['execution'] = "{$lang->executionCommon}版本"; -$lang->build->typeList['project'] = '项目版本'; +$lang->build->isIntegrated = array(); +$lang->build->isIntegrated['no'] = 'No'; +$lang->build->isIntegrated['yes'] = 'Yes'; diff --git a/module/build/lang/fr.php b/module/build/lang/fr.php index e5e151b4e4..0b5a0b8f6b 100644 --- a/module/build/lang/fr.php +++ b/module/build/lang/fr.php @@ -33,7 +33,7 @@ $lang->build->project = 'Project'; $lang->build->branch = 'Plateforme/Branche'; $lang->build->branchName = '%s'; $lang->build->execution = $lang->executionCommon; -$lang->build->type = 'Type'; +$lang->build->integrated = 'Integrated'; $lang->build->builds = 'Linked Builds'; $lang->build->name = 'Nom'; $lang->build->date = 'Date'; @@ -75,6 +75,6 @@ $lang->backhome = 'Retour'; $lang->build->featureBar['browse']['all'] = 'Build List'; -$lang->build->typeList = array(); -$lang->build->typeList['execution'] = "{$lang->executionCommon}版本"; -$lang->build->typeList['project'] = '项目版本'; +$lang->build->isIntegrated = array(); +$lang->build->isIntegrated['no'] = 'No'; +$lang->build->isIntegrated['yes'] = 'Yes'; diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php index 8f686f1cac..03a082f0ea 100644 --- a/module/build/lang/zh-cn.php +++ b/module/build/lang/zh-cn.php @@ -33,7 +33,7 @@ $lang->build->project = '所属项目'; $lang->build->branch = '平台/分支'; $lang->build->branchName = '所属%s'; $lang->build->execution = '所属' . $lang->executionCommon; -$lang->build->type = '版本类型'; +$lang->build->integrated = '集成版本'; $lang->build->builds = '关联版本'; $lang->build->name = '名称编号'; $lang->build->date = '打包日期'; @@ -74,6 +74,6 @@ $lang->build->action->buildopened = '$date, 由 $actor 创建 $lang->backhome = '返回'; -$lang->build->typeList = array(); -$lang->build->typeList['execution'] = "{$lang->executionCommon}版本"; -$lang->build->typeList['project'] = '项目版本'; +$lang->build->isIntegrated = array(); +$lang->build->isIntegrated['no'] = '否'; +$lang->build->isIntegrated['yes'] = '是'; diff --git a/module/build/model.php b/module/build/model.php index f4ab227ef9..4890255349 100644 --- a/module/build/model.php +++ b/module/build/model.php @@ -350,10 +350,10 @@ class buildModel extends model ->add('createdDate', helper::now()) ->stripTags($this->config->build->editor->create['id'], $this->config->allowedTags) ->join('builds', ',') - ->remove('resolvedBy,allchecker,files,labels,type,uid') + ->remove('resolvedBy,allchecker,files,labels,isIntegrated,uid') ->get(); - if($this->post->type == 'project') $build->execution = 0; + if($this->post->isIntegrated == 'yes') $build->execution = 0; $build = $this->loadModel('file')->processImgURL($build, $this->config->build->editor->create['id'], $this->post->uid); $this->dao->insert(TABLE_BUILD)->data($build) diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php index c097424ee5..eb4b75d4e0 100644 --- a/module/build/view/create.html.php +++ b/module/build/view/create.html.php @@ -20,8 +20,8 @@