[MediaWiki-commits] [Gerrit] Hide filters not intended for user selection - change (wikimedia...dash)

2015-12-12 Thread Cdentinger (Code Review) 
Cdentinger has submitted this change and it was merged.

Change subject: Hide filters not intended for user selection
..


Hide filters not intended for user selection

We define filters for components of date, but those are meant
for use in code, not by users.  Zap their display names and hide
their controls.

Change-Id: I71cc01b2715cd5141da74510fc2c189bfc1bb6dc
---
M src/components/filters/filters.js
M widgets/common-filters.js
2 files changed, 3 insertions(+), 14 deletions(-)

Approvals:
  Cdentinger: Verified; Looks good to me, approved



diff --git a/src/components/filters/filters.js 
b/src/components/filters/filters.js
index 8b0fe64..6198f17 100644
--- a/src/components/filters/filters.js
+++ b/src/components/filters/filters.js
@@ -33,6 +33,9 @@
params.metadataRequest.then( function( metadata ) {
var filters = [];
$.each( metadata.filters, function( name, filterMeta ) {
+   if ( !filterMeta.display ) {
+   return;
+   }
var filter = {
name: name,
metadata: filterMeta,
diff --git a/widgets/common-filters.js b/widgets/common-filters.js
index b12fd90..6e334d2 100644
--- a/widgets/common-filters.js
+++ b/widgets/common-filters.js
@@ -19,7 +19,6 @@
table: 'cc',
func: 'YEAR',
column: 'receive_date',
-   display: 'Year',
type: 'number',
canGroup: true
},
@@ -27,7 +26,6 @@
table: 'cc',
func: 'MONTH',
column: 'receive_date',
-   display: 'Month',
type: 'number',
canGroup: true
},
@@ -35,7 +33,6 @@
table: 'cc',
func: 'DAY',
column: 'receive_date',
-   display: 'Year',
type: 'number',
canGroup: true
},
@@ -43,7 +40,6 @@
table: 'cc',
func: 'HOUR',
column: 'receive_date',
-   display: 'Hour',
type: 'number',
canGroup: true
},
@@ -51,7 +47,6 @@
table: 'cc',
column : 'receive_date',
func: 'timestampdiff(YEAR, [[COL]], utc_timestamp())',
-   display: 'Years ago',
type: 'number',
min: 0,
max: 12
@@ -60,7 +55,6 @@
table: 'cc',
column : 'receive_date',
func: 'timestampdiff(MONTH, [[COL]], utc_timestamp())',
-   display: 'Months ago',
type: 'number',
min: 0,
max: 1
@@ -69,7 +63,6 @@
table: 'cc',
column : 'receive_date',
func: 'timestampdiff(DAY, [[COL]], utc_timestamp())',
-   display: 'Days ago',
type: 'number',
min: 0,
max: 1
@@ -188,7 +181,6 @@
table: 'pf',
func: 'YEAR',
column: 'date',
-   display: 'Year',
type: 'number',
canGroup: true
},
@@ -196,7 +188,6 @@
table: 'pf',
func: 'MONTH',
column: 'date',
-   display: 'Month',
type: 'number',
canGroup: true
},
@@ -204,7 +195,6 @@
table: 'pf',
func: 'DAY',
column: 'date',
-   display: 'Year',
type: 'number',
canGroup: true
},
@@ -212,7 +202,6 @@
table: 'pf',
func: 'HOUR',
column: 'date',
-   display: 'Hour',
type: 'number',
canGroup: true
},
@@ -220,7 +209,6 @@
table: 'pf',
column : 'date',
func: 'timestampdiff(YEAR, [[COL]], utc_timestamp())',
-   display: 'Years ago',
type: 'number',

[MediaWiki-commits] [Gerrit] Hide filters not intended for user selection - change (wikimedia...dash)

2015-12-06 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/257204

Change subject: Hide filters not intended for user selection
..

Hide filters not intended for user selection

We define filters for components of date, but those are meant
for use in code, not by users.  Zap their display names and hide
their controls.

Change-Id: I71cc01b2715cd5141da74510fc2c189bfc1bb6dc
---
M src/components/filters/filters.js
M widgets/common-filters.js
2 files changed, 3 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash 
refs/changes/04/257204/1

diff --git a/src/components/filters/filters.js 
b/src/components/filters/filters.js
index 479536e..a84e0ac 100644
--- a/src/components/filters/filters.js
+++ b/src/components/filters/filters.js
@@ -33,6 +33,9 @@
params.metadataRequest.then( function( metadata ) {
var filters = [];
$.each( metadata.filters, function( name, filterMeta ) {
+   if ( !filterMeta.display ) {
+   return;
+   }
var filter = {
name: name,
metadata: filterMeta,
diff --git a/widgets/common-filters.js b/widgets/common-filters.js
index b12fd90..6e334d2 100644
--- a/widgets/common-filters.js
+++ b/widgets/common-filters.js
@@ -19,7 +19,6 @@
table: 'cc',
func: 'YEAR',
column: 'receive_date',
-   display: 'Year',
type: 'number',
canGroup: true
},
@@ -27,7 +26,6 @@
table: 'cc',
func: 'MONTH',
column: 'receive_date',
-   display: 'Month',
type: 'number',
canGroup: true
},
@@ -35,7 +33,6 @@
table: 'cc',
func: 'DAY',
column: 'receive_date',
-   display: 'Year',
type: 'number',
canGroup: true
},
@@ -43,7 +40,6 @@
table: 'cc',
func: 'HOUR',
column: 'receive_date',
-   display: 'Hour',
type: 'number',
canGroup: true
},
@@ -51,7 +47,6 @@
table: 'cc',
column : 'receive_date',
func: 'timestampdiff(YEAR, [[COL]], utc_timestamp())',
-   display: 'Years ago',
type: 'number',
min: 0,
max: 12
@@ -60,7 +55,6 @@
table: 'cc',
column : 'receive_date',
func: 'timestampdiff(MONTH, [[COL]], utc_timestamp())',
-   display: 'Months ago',
type: 'number',
min: 0,
max: 1
@@ -69,7 +63,6 @@
table: 'cc',
column : 'receive_date',
func: 'timestampdiff(DAY, [[COL]], utc_timestamp())',
-   display: 'Days ago',
type: 'number',
min: 0,
max: 1
@@ -188,7 +181,6 @@
table: 'pf',
func: 'YEAR',
column: 'date',
-   display: 'Year',
type: 'number',
canGroup: true
},
@@ -196,7 +188,6 @@
table: 'pf',
func: 'MONTH',
column: 'date',
-   display: 'Month',
type: 'number',
canGroup: true
},
@@ -204,7 +195,6 @@
table: 'pf',
func: 'DAY',
column: 'date',
-   display: 'Year',
type: 'number',
canGroup: true
},
@@ -212,7 +202,6 @@
table: 'pf',
func: 'HOUR',
column: 'date',
-   display: 'Hour',
type: 'number',
canGroup: true
},
@@ -220,7 +209,6 @@
table: 'pf',
column : 'date',
func: 'timestampdiff(YEAR, [[COL]], utc_timestamp())',
-   display: 'Years ago',