From 356e5e0c43aaaf5a7547c052d535b6c5f88130fc Mon Sep 17 00:00:00 2001
From: jiazhong <jiazhong@ebay.com>
Date: Sun, 4 Jan 2015 14:07:52 +0800
Subject: [PATCH 1/3] add include,exclude tip to build job date & fix cube list
 bug

---
 webapp/app/js/controllers/cubes.js       | 1 -
 webapp/app/partials/jobs/job_submit.html | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js
index 6c3fc93..5930121 100644
--- a/webapp/app/js/controllers/cubes.js
+++ b/webapp/app/js/controllers/cubes.js
@@ -61,7 +61,6 @@ KylinApp
                         $scope.loadDetail(cube);
                     }
                 });
-                $scope.cubes=[];
                 $scope.cubes = $scope.cubes.concat(cubes);
                 $scope.loading = false;
                 defer.resolve(cubes.length);
diff --git a/webapp/app/partials/jobs/job_submit.html b/webapp/app/partials/jobs/job_submit.html
index 6e44d33..942da01 100644
--- a/webapp/app/partials/jobs/job_submit.html
+++ b/webapp/app/partials/jobs/job_submit.html
@@ -15,7 +15,7 @@
                             <td>{{cube.detail.cube_partition_desc.partition_date_column}}</td>
                         </tr>
                         <tr>
-                            <td>START DATE</td>
+                            <td>Start Date (Include)</td>
                             <td>
                                 <div ng-if="cube.segments.length == 0">
                                     {{jobBuildRequest.startTime =
@@ -38,7 +38,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td>END DATE</td>
+                            <td>End Date (Exclude)</td>
                             <td>
                                 <input type="text" datepicker-popup="yyyy-MM-dd" class="input-sm" style="width: 98%"
                                        ng-model="jobBuildRequest.endTime"

From 2f4a9c33b029a00156a56d9fb0c810dd0eed6dae Mon Sep 17 00:00:00 2001
From: jiazhong <jiazhong@ebay.com>
Date: Sun, 4 Jan 2015 14:08:59 +0800
Subject: [PATCH 2/3] remove ng-init directive in advanced_setting,incremental

---
 webapp/app/js/controllers/cubeEdit.js               |  4 ++--
 .../partials/cubeDesigner/advanced_settings.html    | 21 ---------------------
 webapp/app/partials/cubeDesigner/incremental.html   |  1 -
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js
index 8130497..50320cc 100644
--- a/webapp/app/js/controllers/cubeEdit.js
+++ b/webapp/app/js/controllers/cubeEdit.js
@@ -95,9 +95,9 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
                 "cube_partition_desc": {
                     "partition_date_column": null,
                     "partition_date_start": null,
-                    "cube_partition_type": null
+                    "cube_partition_type": 'APPEND'
                 },
-                "capacity": "",
+                "capacity": "MEDIUM",
                 "cost": 50,
                 "dimensions": [],
                 "measures": [
diff --git a/webapp/app/partials/cubeDesigner/advanced_settings.html b/webapp/app/partials/cubeDesigner/advanced_settings.html
index 91f9882..7db3077 100644
--- a/webapp/app/partials/cubeDesigner/advanced_settings.html
+++ b/webapp/app/partials/cubeDesigner/advanced_settings.html
@@ -12,7 +12,6 @@
                             <label class="control-label col-xs-12 col-sm-3 no-padding-right font-color-default"><b>Cube Size</b></label>
                             <div class="col-xs-12 col-sm-6">
                                 <select class="form-control" ng-if="state.mode=='edit'" style="width: 360px;"
-                                        ng-init="cubeMetaFrame.capacity = dftSelections.cubeCapacity"
                                         chosen ng-model="cubeMetaFrame.capacity" required
                                         ng-options="cc as cc for cc in cubeCapacities">
                                 </select>
@@ -22,26 +21,6 @@
                     </div>
                 </td>
             </tr>
-            <!--hidde-->
-            <tr class="hidden">
-                <td>
-                    <!--Query Priority-->
-                    <div class="form-group" ng-show="userService.hasRole('ROLE_ADMIN')">
-                        <div class="row">
-                            <label class="control-label col-xs-12 col-sm-3 no-padding-right font-color-default"><b>Query Priority</b></label>
-                            <div class="col-xs-12 col-sm-3">
-                                <select class="form-control" style="width: 360px;"
-                                        ng-init="cubeMetaFrame.cost = dftSelections.queryPriority.value"
-                                        ng-if="state.mode=='edit'"
-                                        chosen ng-model="cubeMetaFrame.cost" required
-                                        ng-options="qp.value as qp.name for qp in queryPriorities">
-                                </select>
-                                <span ng-if="state.mode=='view'">{{cubeMetaFrame.cost}}</span>
-                            </div>
-                        </div>
-                    </div>
-                </td>
-            </tr>
         </table>
 
     </div>
diff --git a/webapp/app/partials/cubeDesigner/incremental.html b/webapp/app/partials/cubeDesigner/incremental.html
index 352ff73..4f9f349 100644
--- a/webapp/app/partials/cubeDesigner/incremental.html
+++ b/webapp/app/partials/cubeDesigner/incremental.html
@@ -7,7 +7,6 @@
                 <label class="control-label col-xs-12 col-sm-3 no-padding-right font-color-default"><b>Partition Type</b></label>
                 <div class="col-xs-12 col-sm-6">
                     <select class="form-control"
-                        ng-init="cubeMetaFrame.cube_partition_desc.cube_partition_type =dftSelections.cubePartitionType"
                         ng-if="state.mode=='edit'"
                         chosen ng-model="cubeMetaFrame.cube_partition_desc.cube_partition_type" required
                         ng-options="ddt as ddt for ddt in cubePartitionTypes">

From ad311db2c00f76ebc75be85059459832f0f319ac Mon Sep 17 00:00:00 2001
From: jiazhong <jiazhong@ebay.com>
Date: Sun, 4 Jan 2015 16:36:23 +0800
Subject: [PATCH 3/3] add cors filter for kylin-server

---
 .../com/kylinolap/rest/filter/KylinCORSFilter.java | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 server/src/main/java/com/kylinolap/rest/filter/KylinCORSFilter.java

diff --git a/server/src/main/java/com/kylinolap/rest/filter/KylinCORSFilter.java b/server/src/main/java/com/kylinolap/rest/filter/KylinCORSFilter.java
new file mode 100644
index 0000000..7f1a144
--- /dev/null
+++ b/server/src/main/java/com/kylinolap/rest/filter/KylinCORSFilter.java
@@ -0,0 +1,28 @@
+package com.kylinolap.rest.filter;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletResponse;
+
+public class KylinCORSFilter implements Filter {
+
+    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException {
+        HttpServletResponse response = (HttpServletResponse) res;
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+        response.setHeader("Access-Control-Max-Age", "3600");
+        response.setHeader("Access-Control-Allow-Headers", "x-requested-with");
+        chain.doFilter(req, res);
+    }
+
+    public void init(FilterConfig filterConfig) {}
+
+    public void destroy() {}
+
+}