You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ch...@apache.org on 2017/07/19 10:04:25 UTC
[1/2] kylin git commit: minor,refine no result position
Repository: kylin
Updated Branches:
refs/heads/2.1.x 453d7bde9 -> 7ac68400c
minor,refine no result position
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/6004c3e8
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/6004c3e8
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/6004c3e8
Branch: refs/heads/2.1.x
Commit: 6004c3e8393962c88a931094674528e82a565012
Parents: 453d7bd
Author: luguosheng1314 <55...@qq.com>
Authored: Tue Jul 4 16:04:49 2017 +0800
Committer: chenzhx <34...@qq.com>
Committed: Wed Jul 19 18:03:55 2017 +0800
----------------------------------------------------------------------
webapp/app/partials/modelDesigner/model_info.html | 2 +-
webapp/app/partials/projects/project_detail.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/6004c3e8/webapp/app/partials/modelDesigner/model_info.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/modelDesigner/model_info.html b/webapp/app/partials/modelDesigner/model_info.html
index ae8237f..59a565b 100644
--- a/webapp/app/partials/modelDesigner/model_info.html
+++ b/webapp/app/partials/modelDesigner/model_info.html
@@ -35,7 +35,7 @@
ng-model="modelsManager.selectedModel.name" required
placeholder="You can use letters, numbers, and '_'"
ng-maxlength=100 ng-pattern="/^\w+$/" />
- <small class="help-block" ng-show="forms.model_info_form.model_name.$error.required && (forms.model_info_form.model_name.$dirty||forms.model_info_form.$submitted)">Model name is required.</small>
+ <small style="color:red" class="help-block" ng-show="forms.model_info_form.model_name.$error.required && (forms.model_info_form.model_name.$dirty||forms.model_info_form.$submitted)">Model name is required.</small>
<small class="help-block" ng-show="!forms.model_info_form.model_name.$error.required&&forms.model_info_form.model_name.$invalid && (forms.model_info_form.model_name.$dirty||forms.model_info_form.$submitted)">Model name is invalid.</small>
http://git-wip-us.apache.org/repos/asf/kylin/blob/6004c3e8/webapp/app/partials/projects/project_detail.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/projects/project_detail.html b/webapp/app/partials/projects/project_detail.html
index 431073a..5cfc091 100644
--- a/webapp/app/partials/projects/project_detail.html
+++ b/webapp/app/partials/projects/project_detail.html
@@ -76,7 +76,7 @@
</tbody>
</table>
</div>
- <div no-result ng-if="getMapLength(project.override_kylin_properties) == 0"></div>
+ <div no-result ng-if="getMapLength(project.override_kylin_properties) == 0" style="clear:both"></div>
<div class="col-xs-1"></div>
</div>
</div>
[2/2] kylin git commit: remove links of system and remove useless
debug log
Posted by ch...@apache.org.
remove links of system and remove useless debug log
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/7ac68400
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/7ac68400
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/7ac68400
Branch: refs/heads/2.1.x
Commit: 7ac68400c1420dbea23b74ad56575e879c26cafb
Parents: 6004c3e
Author: luguosheng1314 <55...@qq.com>
Authored: Tue Jul 4 16:16:08 2017 +0800
Committer: chenzhx <34...@qq.com>
Committed: Wed Jul 19 18:04:18 2017 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/cubeMeasures.js | 1 -
webapp/app/js/controllers/modelDataModel.js | 1 -
webapp/app/js/controllers/sourceMeta.js | 2 --
webapp/app/partials/admin/admin.html | 16 ++++++++--------
4 files changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/7ac68400/webapp/app/js/controllers/cubeMeasures.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeMeasures.js b/webapp/app/js/controllers/cubeMeasures.js
index 0a012dd..2b86683 100644
--- a/webapp/app/js/controllers/cubeMeasures.js
+++ b/webapp/app/js/controllers/cubeMeasures.js
@@ -120,7 +120,6 @@ KylinApp.controller('CubeMeasuresCtrl', function ($scope, $modal,MetaModel,cubes
$scope.nextParameters[i].next_parameter=$scope.nextParameters[i+1];
}
$scope.newMeasure.function.parameter.next_parameter = $scope.nextParameters[0];
- console.log($scope.newMeasure.function.parameter);
}
$scope.editNextParameter = function(parameter){
http://git-wip-us.apache.org/repos/asf/kylin/blob/7ac68400/webapp/app/js/controllers/modelDataModel.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/modelDataModel.js b/webapp/app/js/controllers/modelDataModel.js
index dcc9e8e..42c877c 100644
--- a/webapp/app/js/controllers/modelDataModel.js
+++ b/webapp/app/js/controllers/modelDataModel.js
@@ -218,7 +218,6 @@ KylinApp.controller('ModelDataModelCtrl', function ($location,$scope, $modal,cub
lookupList.splice(lookupList.indexOf(lookup), 1);
$scope.aliasName.splice($scope.aliasName.indexOf(lookup.alias),1);
}
- console.log($scope.aliasName);
};
$scope.changeKey = function(index){
http://git-wip-us.apache.org/repos/asf/kylin/blob/7ac68400/webapp/app/js/controllers/sourceMeta.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/sourceMeta.js b/webapp/app/js/controllers/sourceMeta.js
index c2122ad..4f341f0 100755
--- a/webapp/app/js/controllers/sourceMeta.js
+++ b/webapp/app/js/controllers/sourceMeta.js
@@ -644,12 +644,10 @@ KylinApp
$scope.streamingOnChange = function () {
$scope.table.schemaChecked = true;
- console.log($scope.streaming.sourceSchema);
try {
$scope.streaming.parseResult = JSON.parse($scope.streaming.sourceSchema);
} catch (error) {
$scope.table.sourceValid = false;
- console.log(error);
return;
}
$scope.table.sourceValid = true;
http://git-wip-us.apache.org/repos/asf/kylin/blob/7ac68400/webapp/app/partials/admin/admin.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/admin/admin.html b/webapp/app/partials/admin/admin.html
index b4bca8d..be0156a 100644
--- a/webapp/app/partials/admin/admin.html
+++ b/webapp/app/partials/admin/admin.html
@@ -64,14 +64,14 @@
<a ng-click="downloadBadQueryFiles();" tooltip="Download Diagnosis Info For Current Project" class="btn btn-primary btn-lg btn-block"><i class="fa fa-ambulance"></i> Diagnosis</a>
</div>
- <div>
- <h3>Links</h3>
- </div>
- <div style="padding-top: 10px" ng-if="config.reference_links['hadoop']">
- <a class="label-lg label-yellow arrowed-right"style="font-size:18px;" tooltip="Cluster Resource Monitoring" href="{{config.reference_links['hadoop'].link}}" >
- Hadoop Monitor
- </a>
- </div>
+ <!--<div>-->
+ <!--<h3>Links</h3>-->
+ <!--</div>-->
+ <!--<div style="padding-top: 10px" ng-if="config.reference_links['hadoop']">-->
+ <!--<a class="label-lg label-yellow arrowed-right"style="font-size:18px;" tooltip="Cluster Resource Monitoring" href="{{config.reference_links['hadoop'].link}}" >-->
+ <!--Hadoop Monitor-->
+ <!--</a>-->
+ <!--</div>-->
</div>
</div>