[MediaWiki-commits] [Gerrit] Add promise library - change (wikimedia...node_modules)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/183378
Change subject: Add promise library
..
Add promise library
Change-Id: Ib6a6d8736b99aa6cc3edf1519f2b150e473dc48a
---
A promise/.jshintrc
A promise/.npmignore
A promise/LICENSE
A promise/Readme.md
A promise/core.js
A promise/index.js
A promise/lib/core.js
A promise/lib/done.js
A promise/lib/es6-extensions.js
A promise/lib/node-extensions.js
A promise/node_modules/asap/LICENSE.md
A promise/node_modules/asap/README.md
A promise/node_modules/asap/asap.js
A promise/node_modules/asap/package.json
A promise/package.json
A promise/polyfill-done.js
A promise/polyfill.js
17 files changed, 872 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash/node_modules
refs/changes/78/183378/1
diff --git a/promise/.jshintrc b/promise/.jshintrc
new file mode 100644
index 000..abbe750
--- /dev/null
+++ b/promise/.jshintrc
@@ -0,0 +1,5 @@
+{
+ asi: true,
+ node: true,
+ strict: true
+}
diff --git a/promise/.npmignore b/promise/.npmignore
new file mode 100644
index 000..6ffaded
--- /dev/null
+++ b/promise/.npmignore
@@ -0,0 +1,6 @@
+components
+node_modules
+test
+.gitignore
+.travis.yml
+component.json
diff --git a/promise/LICENSE b/promise/LICENSE
new file mode 100644
index 000..060e6c9
--- /dev/null
+++ b/promise/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2014 Forbes Lindesay
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the Software), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/promise/Readme.md b/promise/Readme.md
new file mode 100644
index 000..27b4ecc
--- /dev/null
+++ b/promise/Readme.md
@@ -0,0 +1,217 @@
+a href=http://promises-aplus.github.com/promises-spec;img
src=http://promises-aplus.github.com/promises-spec/assets/logo-small.png;
align=right //a
+# promise
+
+This is a simple implementation of Promises. It is a super set of ES6
Promises designed to have readable, performant code and to provide just the
extensions that are absolutely necessary for using promises today.
+
+For detailed tutorials on its use, see www.promisejs.org
+
+[](https://travis-ci.org/then/promise)
+[](https://gemnasium.com/then/promise)
+[](https://www.npmjs.org/package/promise)
+
+## Installation
+
+**Server:**
+
+$ npm install promise
+
+**Client:**
+
+You can use browserify on the client, or use the pre-compiled script that acts
as a polyfill.
+
+```html
+script src=https://www.promisejs.org/polyfills/promise-4.0.0.js;/script
+```
+
+Note that the [es5-shim](https://github.com/es-shims/es5-shim) must be loaded
before this library to support browsers pre IE9.
+
+```html
+script
src=https://cdnjs.cloudflare.com/ajax/libs/es5-shim/3.4.0/es5-shim.min.js;/script
+```
+
+## Usage
+
+The example below shows how you can load the promise library (in a way that
works on both client and server). It then demonstrates creating a promise from
scratch. You simply call `new Promise(fn)`. There is a complete specification
for what is returned by this method in
[Promises/A+](http://promises-aplus.github.com/promises-spec/).
+
+```javascript
+var Promise = require('promise');
+
+var promise = new Promise(function (resolve, reject) {
+ get('http://www.google.com', function (err, res) {
+if (err) reject(err);
+else resolve(res);
+ });
+});
+```
+
+## API
+
+Before all examples, you will need:
+
+```js
+var Promise = require('promise');
+```
+
+### new Promise(resolver)
+
+This creates and returns a new promise. `resolver` must be a function. The
`resolver` function is passed two arguments:
+
+ 1. `resolve` should be called with a single argument. If it is called with a
non-promise value then the promise is fulfilled with that value. If it is
called with a promise (A) then the returned
[MediaWiki-commits] [Gerrit] Create local user records on login - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/183381
Change subject: Create local user records on login
..
Create local user records on login
On login, create local user record and create a default dashboard
if either does not yet exist.
Change-Id: I71e93d20cbb89a12f9d52ca71ce606d0686fd06b
---
A persistence.js
M server.js
2 files changed, 88 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/81/183381/1
diff --git a/persistence.js b/persistence.js
new file mode 100644
index 000..bac33b1
--- /dev/null
+++ b/persistence.js
@@ -0,0 +1,74 @@
+var mysql = require ( 'mysql'),
+ config = require( './config.js' ),
+ Promise = require( 'promise' );
+
+function getConnection() {
+ var connection = mysql.createConnection({
+ host: config.dbserver,
+ user: config.dblogin,
+ password: config.dbpwd,
+ database: config.db,
+ multipleStatements: true
+ });
+ return new Promise( function( fulfill, reject ) {
+ connection.connect( function( error ) {
+ if ( error ) {
+ console.log( 'rejecting for connection error '
+ error );
+ reject( error );
+ }
+ });
+ fulfill( connection );
+ });
+}
+
+module.exports = {
+ /**
+* Ensures a user exists in the user table and saves the user's local
db id
+* in session. Creates a default board if none exists.
+* @param Object user should have displayName, provider, and id set by
oauth
+* @return Object Promise that fulfills on completion or rejects with
error
+*/
+ loginUser: function( user ) {
+ var params = [ user.id, user.provider, user.displayName ],
+ insertUser = 'INSERT IGNORE INTO dash_user ( oauth_id,
oauth_provider, display_name ) VALUES ( ?, ?, ? )',
+ getInfo = 'SELECT id, default_board from dash_user
where oauth_id = ? and oauth_provider = ?',
+ insertBoard = 'INSERT INTO dash_board ( display_name,
owner_id ) VALUES ( ?, ? ); UPDATE dash_user SET default_board =
LAST_INSERT_ID() WHERE id = ?; SELECT LAST_INSERT_ID() AS id';
+
+ return new Promise( function( fulfill, reject ) {
+ getConnection().then( function( connection ) {
+ connection.query( insertUser, params, function(
error ) {
+ if ( error ) {
+ reject( error );
+ return;
+ }
+ connection.query( getInfo, params,
function( error, dbResults ) {
+ if ( error ) {
+ console.log( 'rejecting
getInfo' );
+ reject( error );
+ return;
+ }
+ var userId = dbResults[0].id,
+ defaultBoard =
dbResults[0].default_board;
+ user.localId = userId;
+ if ( defaultBoard ) {
+ user.defaultBoard =
defaultBoard;
+ fulfill( true );
+ return;
+ }
+ // If user doesn't have a
default board, insert one now
+ connection.query( insertBoard,
[ 'Default dashboard for ' + user.displayName, userId, userId ], function(
error, dbResults ) {
+ if ( error ) {
+ reject( error );
+ return;
+ }
+ user.defaultBoard =
dbResults[0].id;
+ fulfill( true );
+ });
+ });
+ });
+ }, function( error ) {
+ reject( error );
+ });
+
[MediaWiki-commits] [Gerrit] Add promise to package.json and update node_modules - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/183380
Change subject: Add promise to package.json and update node_modules
..
Add promise to package.json and update node_modules
Change-Id: I8a06a085daad3b72228a3dd8ad220135746d966d
---
M node_modules
M package.json
2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/80/183380/1
diff --git a/node_modules b/node_modules
index f7d9d58..33cc250 16
--- a/node_modules
+++ b/node_modules
-Subproject commit f7d9d58629d35f63eb5a4a8380fa246475be8340
+Subproject commit 33cc25094b5936983724ca16ed10730c99e7d9e4
diff --git a/package.json b/package.json
index 993bd63..a060d65 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,8 @@
odata-parser: ~1.0.0,
passport: ^0.2.1,
passport-drupal: 0.3.3,
-passport-oauth: ^1.0.0
+passport-oauth: ^1.0.0,
+promise: ^6.0.1
},
devDependencies: {
chalk: ^0.5.1,
--
To view, visit https://gerrit.wikimedia.org/r/183380
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a06a085daad3b72228a3dd8ad220135746d966d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Persistence schema - change (wikimedia...dash)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/183379 Change subject: Persistence schema .. Persistence schema Add tables for users, dashboards, and widgets. Populate widget tables with definitions of existing widgets, add preview images. Change-Id: I42b167b83dea0af2300890e176794380b7577572 --- A persistence.sql A src/images/big-english.png A src/images/fraud-gauge.png A src/images/x-by-y.png 4 files changed, 48 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/79/183379/1 diff --git a/persistence.sql b/persistence.sql new file mode 100644 index 000..c3fe6ba --- /dev/null +++ b/persistence.sql @@ -0,0 +1,48 @@ +CREATE TABLE IF NOT EXISTS dash_user( + id INT AUTO_INCREMENT PRIMARY KEY, /* local id */ + oauth_id VARCHAR(255), /* remote unique id */ + oauth_provider VARCHAR(255), /* service that gave us the remote id */ + display_name VARCHAR(255), /* display name provided by oauth */ + default_board INT, + UNIQUE (oauth_id, oauth_provider) +); +/* List of available widgets */ +CREATE TABLE IF NOT EXISTS dash_widget( + id INT AUTO_INCREMENT PRIMARY KEY, + code VARCHAR(255), /* used in data and metadata URLs */ + display_name VARCHAR(255), + preview_path VARCHAR(255), /* preview image */ + UNIQUE (code) +); +/* Saved widget configurations */ +CREATE TABLE IF NOT EXISTS dash_widget_instance( + id INT AUTO_INCREMENT PRIMARY KEY, + widget_id INT, + owner_id INT, + is_shared BIT DEFAULT 0, + configuration TEXT, /* json blob */ + FOREIGN KEY (widget_id) REFERENCES dash_widget(id), + FOREIGN KEY (owner_id) REFERENCES dash_user(id) +); +/* List of available boards */ +CREATE TABLE IF NOT EXISTS dash_board( + id INT AUTO_INCREMENT PRIMARY KEY, + display_name VARCHAR(255), + owner_id INT NOT NULL, + is_shared BIT DEFAULT 0, + FOREIGN KEY (owner_id) REFERENCES dash_user(id) +); +/* Places widget instances on boards */ +CREATE TABLE IF NOT EXISTS dash_widget_instance_board( + id INT AUTO_INCREMENT PRIMARY KEY, + instance_id INT, + board_id INT, + widget_position INT, + FOREIGN KEY (instance_id) REFERENCES dash_widget_instance(id), + FOREIGN KEY (board_id) REFERENCES dash_board(id) +); + +/* Add definitions for existing widgets */ +INSERT IGNORE INTO dash_widget ( code, display_name, preview_path ) VALUES ( 'fraud', 'Fraud Gauge', 'images/fraud.png' ); +INSERT IGNORE INTO dash_widget ( code, display_name, preview_path ) VALUES ( 'big-english', 'Big English', 'images/big-english.png' ); +INSERT IGNORE INTO dash_widget ( code, display_name, preview_path ) VALUES ( 'x-by-y', 'X by Y', 'images/x-by-y.png' ); diff --git a/src/images/big-english.png b/src/images/big-english.png new file mode 100644 index 000..4cc6b7f --- /dev/null +++ b/src/images/big-english.png Binary files differ diff --git a/src/images/fraud-gauge.png b/src/images/fraud-gauge.png new file mode 100644 index 000..c92eda9 --- /dev/null +++ b/src/images/fraud-gauge.png Binary files differ diff --git a/src/images/x-by-y.png b/src/images/x-by-y.png new file mode 100644 index 000..779b255 --- /dev/null +++ b/src/images/x-by-y.png Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/183379 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I42b167b83dea0af2300890e176794380b7577572 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: master Gerrit-Owner: Ejegg eeggles...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge REL1_23 into fundraising/REL1_23 - change (mediawiki/core)
Ejegg has submitted this change and it was merged. Change subject: Merge REL1_23 into fundraising/REL1_23 .. Merge REL1_23 into fundraising/REL1_23 b54f3fc9ca1ee4eb169deef4def19b632746 Add Content-Length header for job queue requests 43aab90c9a2bff4d236077cd68a912f7833fb52d Bump version number f9c0a427bee70e3ec47cee9f53bdb8ca60f23d6a Make allowing site-wide styles on restricted special pages a config option 479e5bba5da7edf84be17bcf1f22f60d3f68dc08 API: Work around wfMangleFlashPolicy() 881755c48b105d6bcc50a8a4519a1199c1c42788 Make calling wfMangleFlashPolicy configurable e59ca7d233e6a2928cae8ad2330e956a0c825595 Added updated version history from 1.19.2 to 1.22.13 c1d6638704e6e7b2c9cc04481ea2eb4097cbb003 SECURITY: Add edit token to Special:ExpandTemplates 13d1169ff984c3a77673b37c6de88a61c266cc1d SECURITY: Require new right to change content model c4d792821ae5b3368514e9e2279e4c843c25bc63 SECURITY: Do not show log action if revdeleted c07c153196b9a26ee8cfab97539a8e9aaf3865e6 Updated release notes and version number for MediaWiki 1.23.7 4ddeb1b4040b69f2347c1d82eb2bcb94094ae394 Revert SECURITY: Do not show log action if revdeleted and fix UI message d30c8e14b4d9604059fb2aef0f6d8262138cb5ef thumb.php: Set proper output formats for messages going into HTML 4712c3fe51bbdf311bee4211fc7cb21da69a7a3b SECURITY: Fix CORS origin matching in the API 3d6956afe6b897a237b7b7b48416ad4ba9fc7679 Updated release notes and version number to MediaWiki 1.23.8 Change-Id: I83127bfe21dee987889e4b7b023b966bf2618580 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Ejegg: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/183167 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I83127bfe21dee987889e4b7b023b966bf2618580 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_23 Gerrit-Owner: Awight awi...@wikimedia.org Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com Gerrit-Reviewer: Awight awi...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Katie Horn kh...@wikimedia.org Gerrit-Reviewer: Ssmith ssm...@wikimedia.org Gerrit-Reviewer: Waldir wal...@email.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] We don't actually depend on the devel module. Remove it. - change (wikimedia...crm)
Ejegg has submitted this change and it was merged. Change subject: We don't actually depend on the devel module. Remove it. .. We don't actually depend on the devel module. Remove it. Change-Id: Ie30c628a82b4b83bea24fcb4e1c7e576fbd40ad8 --- D sites/all/modules/devel/.gitignore D sites/all/modules/devel/LICENSE.txt D sites/all/modules/devel/README.txt D sites/all/modules/devel/README_devel_node_access.txt D sites/all/modules/devel/devel-rtl.css D sites/all/modules/devel/devel.admin.inc D sites/all/modules/devel/devel.css D sites/all/modules/devel/devel.drush.inc D sites/all/modules/devel/devel.info D sites/all/modules/devel/devel.install D sites/all/modules/devel/devel.js D sites/all/modules/devel/devel.mail.inc D sites/all/modules/devel/devel.module D sites/all/modules/devel/devel.pages.inc D sites/all/modules/devel/devel.rules.inc D sites/all/modules/devel/devel.test D sites/all/modules/devel/develDrushTest.php D sites/all/modules/devel/devel_generate/devel_generate.drush.inc D sites/all/modules/devel/devel_generate/devel_generate.fields.inc D sites/all/modules/devel/devel_generate/devel_generate.inc D sites/all/modules/devel/devel_generate/devel_generate.info D sites/all/modules/devel/devel_generate/devel_generate.module D sites/all/modules/devel/devel_generate/devel_generate_batch.inc D sites/all/modules/devel/devel_generate/file.devel_generate.inc D sites/all/modules/devel/devel_generate/image.devel_generate.inc D sites/all/modules/devel/devel_generate/list.devel_generate.inc D sites/all/modules/devel/devel_generate/number.devel_generate.inc D sites/all/modules/devel/devel_generate/taxonomy.devel_generate.inc D sites/all/modules/devel/devel_generate/text.devel_generate.inc D sites/all/modules/devel/devel_krumo_path.js D sites/all/modules/devel/devel_node_access.api.php D sites/all/modules/devel/devel_node_access.info D sites/all/modules/devel/devel_node_access.install D sites/all/modules/devel/devel_node_access.js D sites/all/modules/devel/devel_node_access.module D sites/all/modules/devel/jquery-1.4.4-uncompressed.js D sites/all/modules/devel/krumo/INSTALL D sites/all/modules/devel/krumo/LICENSE D sites/all/modules/devel/krumo/README D sites/all/modules/devel/krumo/TODO D sites/all/modules/devel/krumo/VERSION D sites/all/modules/devel/krumo/class.krumo.php D sites/all/modules/devel/krumo/docs/Krumo/_class.krumo.php.html D sites/all/modules/devel/krumo/docs/Krumo/krumo.html D sites/all/modules/devel/krumo/docs/blank.html D sites/all/modules/devel/krumo/docs/classtrees_Krumo.html D sites/all/modules/devel/krumo/docs/elementindex.html D sites/all/modules/devel/krumo/docs/elementindex_Krumo.html D sites/all/modules/devel/krumo/docs/errors.html D sites/all/modules/devel/krumo/docs/index.html D sites/all/modules/devel/krumo/docs/li_Krumo.html D sites/all/modules/devel/krumo/docs/media/banner.css D sites/all/modules/devel/krumo/docs/media/images/AbstractClass.png D sites/all/modules/devel/krumo/docs/media/images/AbstractClass_logo.png D sites/all/modules/devel/krumo/docs/media/images/AbstractMethod.png D sites/all/modules/devel/krumo/docs/media/images/AbstractPrivateClass.png D sites/all/modules/devel/krumo/docs/media/images/AbstractPrivateClass_logo.png D sites/all/modules/devel/krumo/docs/media/images/AbstractPrivateMethod.png D sites/all/modules/devel/krumo/docs/media/images/Class.png D sites/all/modules/devel/krumo/docs/media/images/Class_logo.png D sites/all/modules/devel/krumo/docs/media/images/Constant.png D sites/all/modules/devel/krumo/docs/media/images/Constructor.png D sites/all/modules/devel/krumo/docs/media/images/Destructor.png D sites/all/modules/devel/krumo/docs/media/images/Function.png D sites/all/modules/devel/krumo/docs/media/images/Global.png D sites/all/modules/devel/krumo/docs/media/images/I.png D sites/all/modules/devel/krumo/docs/media/images/Index.png D sites/all/modules/devel/krumo/docs/media/images/L.png D sites/all/modules/devel/krumo/docs/media/images/Lminus.png D sites/all/modules/devel/krumo/docs/media/images/Lplus.png D sites/all/modules/devel/krumo/docs/media/images/Method.png D sites/all/modules/devel/krumo/docs/media/images/Page.png D sites/all/modules/devel/krumo/docs/media/images/Page_logo.png D sites/all/modules/devel/krumo/docs/media/images/PrivateClass.png D sites/all/modules/devel/krumo/docs/media/images/PrivateClass_logo.png D sites/all/modules/devel/krumo/docs/media/images/PrivateMethod.png D sites/all/modules/devel/krumo/docs/media/images/PrivateVariable.png D sites/all/modules/devel/krumo/docs/media/images/T.png D sites/all/modules/devel/krumo/docs/media/images/Tminus.png D sites/all/modules/devel/krumo/docs/media/images/Tplus.png D sites/all/modules/devel/krumo/docs/media/images/Variable.png D sites/all/modules/devel/krumo/docs/media/images/blank.png D sites/all/modules/devel/krumo/docs/media/images/class_folder.png D sites/all/modules/devel/krumo/docs/media/images/empty.png D
[MediaWiki-commits] [Gerrit] Add Adyen and WorldPay to reconciliation search criteria - change (wikimedia...crm)
Ejegg has submitted this change and it was merged.
Change subject: Add Adyen and WorldPay to reconciliation search criteria
..
Add Adyen and WorldPay to reconciliation search criteria
Change-Id: I780bfdc671bf3b38859f9658e28bdb2c88abb067
---
M
sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git
a/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
b/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
index aa9712b..dab1ba0 100644
---
a/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
+++
b/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
@@ -7,9 +7,11 @@
function __construct( ) {
$gateway_options = array(
'' = '--any--',
+'ADYEN' = 'Adyen',
'AMAZON' = 'Amazon',
'GLOBALCOLLECT' = 'GlobalCollect',
'PAYPAL' = 'PayPal',
+'WORLDPAY' = 'WorldPay',
);
$this-_columns = array(
--
To view, visit https://gerrit.wikimedia.org/r/112941
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I780bfdc671bf3b38859f9658e28bdb2c88abb067
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Katie Horn kh...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add HK to Alipay form settings - change (mediawiki/core)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/183640
Change subject: Add HK to Alipay form settings
..
Add HK to Alipay form settings
per email thread
Change-Id: I9cc2b8694fab9528d6802f07e3c1b37fe9151661
---
M DonationInterfaceFormSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/40/183640/1
diff --git a/DonationInterfaceFormSettings.php
b/DonationInterfaceFormSettings.php
index 861965f..47b2d4d 100644
--- a/DonationInterfaceFormSettings.php
+++ b/DonationInterfaceFormSettings.php
@@ -103,7 +103,7 @@
'file' = $form_dirs['gc'] . '/ew/ew-alipay.html',
'gateway' = 'globalcollect',
'payment_methods' = array('ew' = 'ew_alipay'),
- 'countries' = array( '+' = array( 'CN', ), ),
+ 'countries' = array( '+' = array( 'CN', 'HK', ), ),
'currencies' = array( '+' = array( 'CNY', ), ),
);
--
To view, visit https://gerrit.wikimedia.org/r/183640
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9cc2b8694fab9528d6802f07e3c1b37fe9151661
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_23
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Ugly URLs to override mobile redirect for CentralNotice - change (operations/mediawiki-config)
Ejegg has submitted this change and it was merged.
Change subject: Ugly URLs to override mobile redirect for CentralNotice
..
Ugly URLs to override mobile redirect for CentralNotice
Change-Id: I1996cf9ebe4e06014fc863cafb1e4164ea1dfc07
---
M wmf-config/CommonSettings.php
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 7760e69..5f8e030 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1404,12 +1404,12 @@
// for banner loading
if ( $wgDBname == 'testwiki' ) {
$wgCentralPagePath = //test.wikipedia.org/w/index.php;
- $wgCentralSelectedBannerDispatcher =
//test.wikipedia.org/wiki/Special:BannerLoader;
- $wgCentralBannerRecorder =
//test.wikipedia.org/wiki/Special:RecordImpression;
+ $wgCentralSelectedBannerDispatcher =
//test.wikipedia.org/w/index.php?title=Special:BannerLoader;
+ $wgCentralBannerRecorder =
//test.wikipedia.org/w/index.php?title=Special:RecordImpression;
} else {
$wgCentralPagePath = //{$wmfHostnames['meta']}/w/index.php;
- $wgCentralSelectedBannerDispatcher =
//{$wmfHostnames['meta']}/wiki/Special:BannerLoader;
- $wgCentralBannerRecorder =
//{$wmfHostnames['meta']}/wiki/Special:RecordImpression;
+ $wgCentralSelectedBannerDispatcher =
//{$wmfHostnames['meta']}/w/index.php?title=Special:BannerLoader;
+ $wgCentralBannerRecorder =
//{$wmfHostnames['meta']}/w/index.php?title=Special:RecordImpression;
}
// Allow only these domains to access CentralNotice data through the
reporter
--
To view, visit https://gerrit.wikimedia.org/r/182078
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1996cf9ebe4e06014fc863cafb1e4164ea1dfc07
Gerrit-PatchSet: 6
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Katie Horn kh...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change name of composer package - change (mediawiki...DonationInterface)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/191942
Change subject: Change name of composer package
..
Change name of composer package
Make it lowercase
Change-Id: I459feb085a4bb61a0700633d0c02536fe19b7c6e
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/42/191942/1
diff --git a/composer.json b/composer.json
index b9aa0ad..7fbf064 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
{
- name: wikimedia/DonationInterface,
+ name: wikimedia/donation-interface,
description: Wikimedia Foundation payment processing library,
license: GPL-2.0,
support: {
--
To view, visit https://gerrit.wikimedia.org/r/191942
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I459feb085a4bb61a0700633d0c02536fe19b7c6e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix some contact autocomplete boxes - change (wikimedia...civicrm)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/191807
Change subject: Fix some contact autocomplete boxes
..
Fix some contact autocomplete boxes
CRM_Utils_Hook::contactListQuery was munging the query so the
aliases didn't come out as the programmer originally intended.
Bug: T90020
Change-Id: I2cbfc568145e7873bc192fce99902733d34d46c0
---
M CRM/Contact/Page/AJAX.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm
refs/changes/07/191807/1
diff --git a/CRM/Contact/Page/AJAX.php b/CRM/Contact/Page/AJAX.php
index d1060a2..bc0de27 100644
--- a/CRM/Contact/Page/AJAX.php
+++ b/CRM/Contact/Page/AJAX.php
@@ -730,7 +730,7 @@
$dao = CRM_Core_DAO::executeQuery($query);
while ($dao-fetch()) {
$result[] = array(
- 'name' = $dao-name,
+ 'name' = $dao-sort_name,
'id' = $dao-id,
);
}
--
To view, visit https://gerrit.wikimedia.org/r/191807
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2cbfc568145e7873bc192fce99902733d34d46c0
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update c3 and d3 to latest supported versions - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/197271
Change subject: Update c3 and d3 to latest supported versions
..
Update c3 and d3 to latest supported versions
Change-Id: Ia4d94b9b7ec25fe90df1dfc6fcbab12d28a436a6
---
M bower.json
M src/bower_modules
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/71/197271/1
diff --git a/bower.json b/bower.json
index e81084b..75802c6 100644
--- a/bower.json
+++ b/bower.json
@@ -24,8 +24,8 @@
dependencies: {
bootstrap-datepicker: ~1.3.0,
bootstrap-timepicker: ~0.2.6,
-d3: ~3.4.11,
-c3: ~0.3.0,
+d3: ~3.5.0,
+c3: ~0.4.10,
chartjs: ~1.0.0,
crossroads: ~0.12.0,
gauge.js: ~1.2.1,
diff --git a/src/bower_modules b/src/bower_modules
index 2a4a5f0..1323394 16
--- a/src/bower_modules
+++ b/src/bower_modules
-Subproject commit 2a4a5f03b54988ec09e76ef69362c39655481918
+Subproject commit 132339455dc0bf26fe7599f2bb57c70800f92b9f
--
To view, visit https://gerrit.wikimedia.org/r/197271
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4d94b9b7ec25fe90df1dfc6fcbab12d28a436a6
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update c3 and d3 - change (wikimedia...bower_modules)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/197270 Change subject: Update c3 and d3 .. Update c3 and d3 Change-Id: I88b74bd865f16678c8e398e34f53d4b5fe778538 --- M c3/.bower.json D c3/Gruntfile.coffee M c3/README.md M c3/bower.json M c3/c3.css M c3/c3.js A c3/c3.min.css M c3/c3.min.js D c3/c3.old.js D c3/component.json A c3/extensions/exporter/config.json A c3/extensions/exporter/phantom-exporter.js A c3/extensions/exporter/test.png D c3/htdocs/css/bootstrap.min.css D c3/htdocs/css/index.css D c3/htdocs/css/style.css D c3/htdocs/data/c3_test.csv D c3/htdocs/data/c3_test.json D c3/htdocs/data/c3_test2.csv D c3/htdocs/data/c3_test2_ts.csv D c3/htdocs/data/c3_test3.csv D c3/htdocs/data/c3_test_2.json D c3/htdocs/data/c3_test_3.json D c3/htdocs/data/c3_test_ts.csv D c3/htdocs/index.html D c3/htdocs/js/require.js D c3/htdocs/js/samples/plugin.js D c3/htdocs/js/samples/requirejs.js D c3/htdocs/js/samples/zoom_reduction.js D c3/htdocs/samples/api_axis_label.html D c3/htdocs/samples/api_axis_range.html D c3/htdocs/samples/api_category.html D c3/htdocs/samples/api_data_colors.html D c3/htdocs/samples/api_flow.html D c3/htdocs/samples/api_flow_timeseries.html D c3/htdocs/samples/api_legend.html D c3/htdocs/samples/api_transform.html D c3/htdocs/samples/api_xgrid_lines.html D c3/htdocs/samples/api_ygrid_lines.html D c3/htdocs/samples/area_zerobased.html D c3/htdocs/samples/axes_padding.html D c3/htdocs/samples/axes_range.html D c3/htdocs/samples/axes_x_localtime.html D c3/htdocs/samples/axes_x_range_timeseries.html D c3/htdocs/samples/axes_x_tick_culling.html D c3/htdocs/samples/axes_x_tick_fit.html D c3/htdocs/samples/axes_x_tick_rotate.html D c3/htdocs/samples/axes_y2.html D c3/htdocs/samples/bar_zerobased.html D c3/htdocs/samples/bindto.html D c3/htdocs/samples/categorized.html D c3/htdocs/samples/chart_area.html D c3/htdocs/samples/chart_area_spline.html D c3/htdocs/samples/chart_area_spline_stacked.html D c3/htdocs/samples/chart_area_stacked.html D c3/htdocs/samples/chart_area_step.html D c3/htdocs/samples/chart_area_step_stacked.html D c3/htdocs/samples/chart_bar.html D c3/htdocs/samples/chart_bar_stacked.html D c3/htdocs/samples/chart_combination.html D c3/htdocs/samples/chart_donut.html D c3/htdocs/samples/chart_gauge.html D c3/htdocs/samples/chart_pie.html D c3/htdocs/samples/chart_pie_sort.html D c3/htdocs/samples/chart_scatter.html D c3/htdocs/samples/chart_spline.html D c3/htdocs/samples/chart_step.html D c3/htdocs/samples/chart_step_category.html D c3/htdocs/samples/custom_x_categorized.html D c3/htdocs/samples/custom_x_scale.html D c3/htdocs/samples/custom_xs_scale.html D c3/htdocs/samples/data_columned.html D c3/htdocs/samples/data_hide.html D c3/htdocs/samples/data_json.html D c3/htdocs/samples/data_label.html D c3/htdocs/samples/data_label_format.html D c3/htdocs/samples/data_load.html D c3/htdocs/samples/data_load_timeseries.html D c3/htdocs/samples/data_region.html D c3/htdocs/samples/data_region_timeseries.html D c3/htdocs/samples/data_rowed.html D c3/htdocs/samples/data_url.html D c3/htdocs/samples/domain_y.html D c3/htdocs/samples/element.html D c3/htdocs/samples/emptydata.html D c3/htdocs/samples/grid_focus.html D c3/htdocs/samples/grid_x_lines.html D c3/htdocs/samples/grid_x_lines_timeseries.html D c3/htdocs/samples/grids.html D c3/htdocs/samples/grids_timeseries.html D c3/htdocs/samples/interaction_enabled.html D c3/htdocs/samples/legend.html D c3/htdocs/samples/padding.html D c3/htdocs/samples/padding_update.html D c3/htdocs/samples/plugin.html D c3/htdocs/samples/point_r.html D c3/htdocs/samples/regions.html D c3/htdocs/samples/requirejs.html D c3/htdocs/samples/selection.html D c3/htdocs/samples/simple.html D c3/htdocs/samples/subchart.html D c3/htdocs/samples/subchart_onbrush.html D c3/htdocs/samples/timeseries.html D c3/htdocs/samples/timeseries_date.html D c3/htdocs/samples/timeseries_descendent.html D c3/htdocs/samples/timeseries_raw.html D c3/htdocs/samples/tooltip_grouped.html D c3/htdocs/samples/tooltip_show.html D c3/htdocs/samples/zoom.html D c3/htdocs/samples/zoom_category.html D c3/htdocs/samples/zoom_onzoom.html D c3/htdocs/samples/zoom_reduction.html D c3/package.json D c3/spec/c3-spec.js D c3/src/api.axis.js D c3/src/api.category.js D c3/src/api.chart.js D c3/src/api.color.js D c3/src/api.data.js D c3/src/api.flow.js D c3/src/api.focus.js D c3/src/api.grid.js D c3/src/api.group.js D c3/src/api.legend.js D c3/src/api.load.js D c3/src/api.region.js D c3/src/api.selection.js D c3/src/api.show.js D c3/src/api.transform.js D c3/src/api.x.js D c3/src/api.zoom.js D c3/src/arc.js D c3/src/axis.js D c3/src/c3.axis.js D c3/src/cache.js D c3/src/category.js D c3/src/class.js D c3/src/clip.js D c3/src/color.js D c3/src/config.js D c3/src/core.js D c3/src/data.convert.js D c3/src/data.js D c3/src/data.load.js D c3/src/domain.js D c3/src/drag.js D c3/src/format.js D c3/src/grid.js D
[MediaWiki-commits] [Gerrit] Set tzoffset on persistent output table - change (wikimedia...tools)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/197273
Change subject: Set tzoffset on persistent output table
..
Set tzoffset on persistent output table
At this point we're done joining to CiviCRM input tables so we don't
need to worry about locking them (this is the reason we initially
import into the temp tables). If we do these failure-prone updates
on the persistent table, we can potentially re-run just these.
Bug: T92537
Change-Id: I0f068964e63f6f59a715c419457e5eb5d7c014a1
---
M silverpop_export/update_table.sql
1 file changed, 51 insertions(+), 42 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools
refs/changes/73/197273/1
diff --git a/silverpop_export/update_table.sql
b/silverpop_export/update_table.sql
index 2665945..6876d02 100755
--- a/silverpop_export/update_table.sql
+++ b/silverpop_export/update_table.sql
@@ -44,7 +44,6 @@
country varchar(2),
state varchar(64),
postal_code varchar(128),
- tzoffset float,
-- Unsubcribe hash
unsub_hash varchar(255),
@@ -53,7 +52,6 @@
INDEX spex_email (email),
INDEX spex_city (city),
INDEX spex_country (country),
- INDEX spex_postal (postal_code),
INDEX spex_opted_out (opted_out)
) COLLATE 'utf8_unicode_ci';
@@ -243,7 +241,6 @@
ex.state = st.name
WHERE
ex.country IS NULL AND
-ex.tzoffset IS NULL AND
ex.opted_out = 0;
-- And now updated by civicrm address where we have a country but no
@@ -260,7 +257,6 @@
ex.state = st.name
WHERE
ex.city IS NULL AND
-ex.tzoffset IS NULL AND
ex.opted_out = 0;
-- Reconstruct the donors likely language from their country if it
@@ -270,45 +266,9 @@
WHERE
ex.country IS NOT NULL AND
ex.preferred_language IS NULL AND
-ex.tzoffset IS NULL AND
ex.country = cl.country AND
ex.opted_out = 0;
--- Lookup timezone by country and post code -- for countries that span
--- multiple timezones.
-UPDATE temp_silverpop_export ex, geonames.geonames g, geonames.altnames a,
geonames.timezones tz
- SET ex.tzoffset = tz.offset
- WHERE
-ex.opted_out = 0 AND
-ex.tzoffset is NULL AND
-ex.postal_code IS NOT NULL AND
-ex.country IN ('FR', 'US', 'RU', 'AU', 'GB', 'CA', 'NZ', 'BR', 'ID', 'MX',
'PT', 'ES') AND
-a.format='post' AND
-ex.country = g.country_code AND
-a.altname = ex.postal_code AND
-a.geonameid = g.geonameid AND
-tz.tzid=g.tzid;
-
--- Lookup timezones by country (mostly for those that do not have
--- multiple timezones.)
-UPDATE
- temp_silverpop_export ex,
- (SELECT g.country_code country_code, tz.offset offset
-FROM geonames.geonames g, geonames.timezones tz
-WHERE g.tzid=tz.tzid
-GROUP BY g.country_code
- ) tz
- SET ex.tzoffset = tz.offset
- WHERE
-ex.opted_out = 0 AND
-ex.tzoffset is NULL AND
-tz.country_code=ex.country;
-
--- If we have no TZ information; set it to UTC
-UPDATE temp_silverpop_export ex
- SET ex.tzoffset = 0
- WHERE ex.tzoffset is NULL AND ex.opted_out = 0;
-
-- Normalize the data prior to final export
UPDATE temp_silverpop_export SET preferred_language='en' WHERE
preferred_language IS NULL;
UPDATE temp_silverpop_export SET
@@ -395,8 +355,57 @@
) COLLATE 'utf8_unicode_ci';
-- Move the data from the temp table into the persistent one
-INSERT INTO silverpop_export
-SELECT * FROM temp_silverpop_export;
+INSERT INTO silverpop_export (
+ id,contact_id,first_name,last_name,preferred_language,email,opted_out,
+ has_recurred_donation,highest_usd_amount,lifetime_usd_total,donation_count,
+ is_2006_donor,is_2007_donor,is_2008_donor,is_2009_donor,is_2010_donor,
+ is_2011_donor,is_2012_donor,is_2013_donor,is_2014_donor,last_ctid,
+ latest_currency,latest_native_amount,latest_usd_amount,latest_donation,
+ city,country,state,postal_code,unsub_hash )
+SELECT id,contact_id,first_name,last_name,preferred_language,email,opted_out,
+ has_recurred_donation,highest_usd_amount,lifetime_usd_total,donation_count,
+ is_2006_donor,is_2007_donor,is_2008_donor,is_2009_donor,is_2010_donor,
+ is_2011_donor,is_2012_donor,is_2013_donor,is_2014_donor,last_ctid,
+ latest_currency,latest_native_amount,latest_usd_amount,latest_donation,
+ city,country,state,postal_code,unsub_hash
+FROM temp_silverpop_export;
+
+-- Set timezone offsets on the persistent table. No joining to CiviCRM
+-- source tables, so no worry about locking them.
+-- Lookup timezone by country and post code -- for countries that span
+-- multiple timezones.
+UPDATE silverpop_export ex
+ JOIN geonames.altnames a ON a.altname = ex.postal_code
+ JOIN geonames.geonames g ON ex.country = g.country_code
+ AND g.geonameid = a.geonameid
+ JOIN geonames.timezones tz ON tz.tzid=g.tzid
+
+ SET ex.tzoffset = tz.offset
+ WHERE
+ex.opted_out = 0 AND
+ex.tzoffset is NULL AND
+ex.country IN ('FR', 'US', 'RU', 'AU', 'GB', 'CA',
[MediaWiki-commits] [Gerrit] Merge branch 'master' into deploy - change (wikimedia...tools)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/197275 Change subject: Merge branch 'master' into deploy .. Merge branch 'master' into deploy 385ab69 Set tzoffset on persistent output table 49ae894 log total number matched Change-Id: I32285cfb90897c668f1795071ba079908f3efd99 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools refs/changes/75/197275/1 -- To view, visit https://gerrit.wikimedia.org/r/197275 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I32285cfb90897c668f1795071ba079908f3efd99 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/tools Gerrit-Branch: deploy Gerrit-Owner: Ejegg eeggles...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge branch 'master' into deploy - change (wikimedia...tools)
Ejegg has submitted this change and it was merged. Change subject: Merge branch 'master' into deploy .. Merge branch 'master' into deploy 385ab69 Set tzoffset on persistent output table 49ae894 log total number matched Change-Id: I32285cfb90897c668f1795071ba079908f3efd99 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Ejegg: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/197275 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I32285cfb90897c668f1795071ba079908f3efd99 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/tools Gerrit-Branch: deploy Gerrit-Owner: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add execute_timeout to limit query lifespan - change (wikimedia...tools)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/197205
Change subject: Add execute_timeout to limit query lifespan
..
Add execute_timeout to limit query lifespan
Brutally murders database connections after a set interval, raising
an OperationalError on the calling thread. The Connection instance
is useless afterward and should be re-instantiated.
Change-Id: I0fca9533bb6c1e2bbf3cd88b4e298ac7e3d07335
---
M database/db.py
1 file changed, 27 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools
refs/changes/05/197205/1
diff --git a/database/db.py b/database/db.py
index 4265627..4bed155 100644
--- a/database/db.py
+++ b/database/db.py
@@ -4,6 +4,7 @@
import MySQLdb as Dbi
import atexit
import os
+import threading
from signal import signal, SIGTERM, SIG_DFL
from process.logging import Logger as log
@@ -11,8 +12,10 @@
class Connection(object):
def __init__(self, debug=False, **kw):
+self.connectionArgs = kw
self.db_conn = Dbi.connect(**kw)
self.debug = debug
+self.connection_id = None
def close(self):
self.db_conn.commit()
@@ -37,6 +40,30 @@
out = cursor.fetchall()
cursor.close()
return out
+
+def execute_timeout(self, sql, params=None, timeout=0):
+ Execute a query with timeout. When a timeout occurs, kill the
database connection
+if timeout == 0:
+return self.execute(sql, params)
+
+if self.connection_id == None:
+self.connection_id = self.execute('SELECT CONNECTION_ID() AS
cid')[0]['cid']
+
+deathClock = threading.Timer(timeout, self.kill_connection)
+deathClock.start()
+
+try:
+return self.execute(sql, params)
+finally:
+deathClock.cancel()
+
+def kill_connection(self):
+if self.debug:
+log.debug('Killing connection {}'.format(self.connection_id))
+killerConnection = Dbi.connect(**self.connectionArgs)
+cursor = killerConnection.cursor()
+cursor.execute('KILL CONNECTION {}'.format(self.connection_id))
+killerConnection.close()
def execute_paged(self, query, pageIndex, pageSize = 1000, dir = 'ASC'):
Execute a paged query. This will yield a dictionary of the results
@@ -117,7 +144,6 @@
for k, s in self.params.items():
qparams[k] = '%s' % s
return self.uninterpolated_sql() % qparams
-
db_conn = dict()
--
To view, visit https://gerrit.wikimedia.org/r/197205
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0fca9533bb6c1e2bbf3cd88b4e298ac7e3d07335
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Drop all timezone stuff - change (wikimedia...tools)
Ejegg has submitted this change and it was merged.
Change subject: Drop all timezone stuff
..
Drop all timezone stuff
This information isn't used, and has been crashing our export.
Bug: T92537
Change-Id: I5b310379be8ffe508af51ac4c01710b51a64195b
---
M silverpop_export/update_table.sql
1 file changed, 0 insertions(+), 39 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/silverpop_export/update_table.sql
b/silverpop_export/update_table.sql
index 6876d02..3a3eeeb 100755
--- a/silverpop_export/update_table.sql
+++ b/silverpop_export/update_table.sql
@@ -332,7 +332,6 @@
country varchar(2),
state varchar(24),
postal_code varchar(128),
- tzoffset float,
-- Unsubcribe hash
unsub_hash varchar(255),
@@ -370,43 +369,6 @@
city,country,state,postal_code,unsub_hash
FROM temp_silverpop_export;
--- Set timezone offsets on the persistent table. No joining to CiviCRM
--- source tables, so no worry about locking them.
--- Lookup timezone by country and post code -- for countries that span
--- multiple timezones.
-UPDATE silverpop_export ex
- JOIN geonames.altnames a ON a.altname = ex.postal_code
- JOIN geonames.geonames g ON ex.country = g.country_code
- AND g.geonameid = a.geonameid
- JOIN geonames.timezones tz ON tz.tzid=g.tzid
-
- SET ex.tzoffset = tz.offset
- WHERE
-ex.opted_out = 0 AND
-ex.tzoffset is NULL AND
-ex.country IN ('FR', 'US', 'RU', 'AU', 'GB', 'CA', 'NZ', 'BR', 'ID', 'MX',
'PT', 'ES') AND
-a.format='post';
-
--- Lookup timezones by country (mostly for those that do not have
--- multiple timezones.)
-UPDATE
- silverpop_export ex,
- (SELECT g.country_code country_code, tz.offset offset
-FROM geonames.geonames g, geonames.timezones tz
-WHERE g.tzid=tz.tzid
-GROUP BY g.country_code
- ) tz
- SET ex.tzoffset = tz.offset
- WHERE
-ex.opted_out = 0 AND
-ex.tzoffset is NULL AND
-tz.country_code=ex.country;
-
--- If we have no TZ information; set it to UTC
-UPDATE silverpop_export ex
- SET ex.tzoffset = 0
- WHERE ex.tzoffset is NULL AND ex.opted_out = 0;
-
-- Create a nice view to export from
CREATE OR REPLACE VIEW silverpop_export_view AS
SELECT
@@ -426,7 +388,6 @@
latest_usd_amount,
latest_currency,
latest_native_amount,
-tzoffset timezone,
donation_count,
IF(is_2006_donor, 'YES', 'NO') is_2006_donor,
IF(is_2007_donor, 'YES', 'NO') is_2007_donor,
--
To view, visit https://gerrit.wikimedia.org/r/197276
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5b310379be8ffe508af51ac4c01710b51a64195b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Katie Horn kh...@wikimedia.org
Gerrit-Reviewer: Springle sprin...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't fraud-fail on STATUSID 25 - change (mediawiki...DonationInterface)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/197440
Change subject: Don't fraud-fail on STATUSID 25
..
Don't fraud-fail on STATUSID 25
Since splitting up staging and unstaging, an empty string added
to a data key is no longer translated to a null in the unstaged
data. This patch ensures that an XML response with no CVVRESULT
node at all sets the cvv_result key to null rather than the empty
string.
Change-Id: I67a84165ea7c310ab21950a096c8036fd0bd9e8e
---
M globalcollect_gateway/globalcollect.adapter.php
M tests/Adapter/GlobalCollect/GlobalCollectTest.php
A tests/includes/Responses/globalcollect/GET_ORDERSTATUS_25.testresponse
3 files changed, 58 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/40/197440/1
diff --git a/globalcollect_gateway/globalcollect.adapter.php
b/globalcollect_gateway/globalcollect.adapter.php
index 5b13476..e235e68 100644
--- a/globalcollect_gateway/globalcollect.adapter.php
+++ b/globalcollect_gateway/globalcollect.adapter.php
@@ -1198,8 +1198,8 @@
$gotCVV = false;
$status_result = $this-do_transaction(
'GET_ORDERSTATUS' );
$xmlResults = array(
- 'cvv_result' = '',
- 'avs_result' = ''
+ 'cvv_result' = null,
+ 'avs_result' = null
);
if ( array_key_exists('data', $status_result) ) {
foreach ( $pull_vars as $theirkey = $ourkey) {
diff --git a/tests/Adapter/GlobalCollect/GlobalCollectTest.php
b/tests/Adapter/GlobalCollect/GlobalCollectTest.php
index faf8a88..219c599 100644
--- a/tests/Adapter/GlobalCollect/GlobalCollectTest.php
+++ b/tests/Adapter/GlobalCollect/GlobalCollectTest.php
@@ -161,6 +161,24 @@
}
/**
+* Don't fraud-fail someone for bad CVV if GET_ORDERSTATUS
+* comes back with STATUSID 25 and no CVVRESULT
+*/
+ function testConfirmCreditCardStatus25() {
+ $init = $this-getDonorTestData();
+ $init['payment_method'] = 'cc';
+ $init['payment_submethod'] = 'visa';
+ $init['email'] = 'innoc...@safedomain.org';
+
+ $gateway = $this-getFreshGatewayObject( $init );
+ $gateway-setDummyGatewayResponseCode( '25' );
+
+ $gateway-do_transaction( 'Confirm_CreditCard' );
+ $action = $gateway-getValidationAction();
+ $this-assertEquals( 'process', $action, 'Gateway should not
fraud fail on STATUSID 25' );
+ }
+
+ /**
* We should skip the API call if we're already suspicious
*/
function testGetOrderStatusSkipsIfFail() {
diff --git
a/tests/includes/Responses/globalcollect/GET_ORDERSTATUS_25.testresponse
b/tests/includes/Responses/globalcollect/GET_ORDERSTATUS_25.testresponse
new file mode 100644
index 000..2a37c20
--- /dev/null
+++ b/tests/includes/Responses/globalcollect/GET_ORDERSTATUS_25.testresponse
@@ -0,0 +1,38 @@
+?xml version = 1.0?
+XML
+ REQUEST
+ ACTIONGET_ORDERSTATUS/ACTION
+ META
+ MERCHANTID1234/MERCHANTID
+ IPADDRESS127.0.0.1/IPADDRESS
+ VERSION2.0/VERSION
+ REQUESTIPADDRESS11.22.33.44/REQUESTIPADDRESS
+ /META
+ PARAMS
+ ORDER
+ ORDERID987654321/ORDERID
+ /ORDER
+ /PARAMS
+ RESPONSE
+ RESULTOK/RESULT
+ META
+ REQUESTID1341324/REQUESTID
+
RESPONSEDATETIME20150310075018/RESPONSEDATETIME
+ /META
+ STATUS
+ STATUSDATE20150310072845/STATUSDATE
+ PAYMENTMETHODID1/PAYMENTMETHODID
+
MERCHANTREFERENCE5551212.23560/MERCHANTREFERENCE
+ ATTEMPTID1/ATTEMPTID
+ PAYMENTREFERENCE0/PAYMENTREFERENCE
+ AMOUNT3000/AMOUNT
+ MERCHANTID1234/MERCHANTID
+ ORDERID987654321/ORDERID
+ STATUSID25/STATUSID
+ EFFORTID1/EFFORTID
+ CURRENCYCODESEK/CURRENCYCODE
+ PAYMENTPRODUCTID1/PAYMENTPRODUCTID
+ /STATUS
+ /RESPONSE
+ /REQUEST
+/XML
--
To view, visit https://gerrit.wikimedia.org/r/197440
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
[MediaWiki-commits] [Gerrit] Delete more unused fields - change (wikimedia...tools)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/197406
Change subject: Delete more unused fields
..
Delete more unused fields
Per CCogdill, the is_20XX_donor fields, last contribution id, and
unsub_hash are all unused.
Change-Id: I911e734f59ca8e042d9f30d978f1a95233caabbd
---
M silverpop_export/update_table.sql
1 file changed, 8 insertions(+), 93 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools
refs/changes/06/197406/1
diff --git a/silverpop_export/update_table.sql
b/silverpop_export/update_table.sql
index 3a3eeeb..591de2e 100755
--- a/silverpop_export/update_table.sql
+++ b/silverpop_export/update_table.sql
@@ -22,15 +22,6 @@
highest_usd_amount decimal(20,2),
lifetime_usd_total decimal(20,2),
donation_count int,
- is_2006_donor tinyint(1),
- is_2007_donor tinyint(1),
- is_2008_donor tinyint(1),
- is_2009_donor tinyint(1),
- is_2010_donor tinyint(1),
- is_2011_donor tinyint(1),
- is_2012_donor tinyint(1),
- is_2013_donor tinyint(1),
- is_2014_donor tinyint(1),
-- Latest contribution statistics
last_ctid int unsigned,
@@ -44,9 +35,6 @@
country varchar(2),
state varchar(64),
postal_code varchar(128),
-
- -- Unsubcribe hash
- unsub_hash varchar(255),
INDEX spex_contact_id (contact_id),
INDEX spex_email (email),
@@ -157,36 +145,17 @@
max_amount_currency varchar(3), -- STEP 5
has_recurred_donation tinyint(1),
total_usd decimal(20,2), -- STEP 5
- cnt_total int unsigned, -- STEP 5
- cnt_2006 int unsigned,-- STEP 5
- cnt_2007 int unsigned,
- cnt_2008 int unsigned,
- cnt_2009 int unsigned,
- cnt_2010 int unsigned,
- cnt_2011 int unsigned,
- cnt_2012 int unsigned,
- cnt_2013 int unsigned,
- cnt_2014 int unsigned,
+ cnt_total int unsigned,
INDEX spexs_email (email)
) COLLATE 'utf8_unicode_ci';
INSERT INTO temp_silverpop_export_stat
- (email, exid, max_ctid, max_amount_usd, total_usd, cnt_total,
has_recurred_donation,
-cnt_2006, cnt_2007, cnt_2008, cnt_2009, cnt_2010, cnt_2011, cnt_2012,
cnt_2013, cnt_2014)
+ (email, exid, max_ctid, max_amount_usd, total_usd, cnt_total,
has_recurred_donation)
SELECT
e.email, ex.id, MAX(ct.id), MAX(ct.total_amount), SUM(ct.total_amount),
count(*),
-MAX(IF(SUBSTRING(ct.trxn_id, 1, 9) = 'RECURRING', 1, 0)),
-SUM(IF('2006-07-1' = ct.receive_date AND ct.receive_date '2007-07-01',
1, 0)),
-SUM(IF('2007-07-1' = ct.receive_date AND ct.receive_date '2008-07-01',
1, 0)),
-SUM(IF('2008-07-1' = ct.receive_date AND ct.receive_date '2009-07-01',
1, 0)),
-SUM(IF('2009-07-1' = ct.receive_date AND ct.receive_date '2010-07-01',
1, 0)),
-SUM(IF('2010-07-1' = ct.receive_date AND ct.receive_date '2011-07-01',
1, 0)),
-SUM(IF('2011-07-1' = ct.receive_date AND ct.receive_date '2012-07-01',
1, 0)),
-SUM(IF('2012-07-1' = ct.receive_date AND ct.receive_date
'2013-07-01', 1, 0)),
-SUM(IF('2013-07-1' = ct.receive_date AND ct.receive_date '2014-07-01',
1, 0)),
-SUM(IF('2014-07-1' = ct.receive_date AND ct.receive_date '2015-07-01',
1, 0))
+MAX(IF(SUBSTRING(ct.trxn_id, 1, 9) = 'RECURRING', 1, 0))
FROM civicrm.civicrm_email e FORCE INDEX(UI_email)
JOIN temp_silverpop_export ex ON e.email=ex.email
JOIN civicrm.civicrm_contribution ct ON e.contact_id=ct.contact_id
@@ -198,16 +167,7 @@
ex.highest_usd_amount = exs.max_amount_usd,
ex.lifetime_usd_total = exs.total_usd,
ex.donation_count = exs.cnt_total,
-ex.has_recurred_donation = IF(exs.has_recurred_donation 0, 1, 0),
-ex.is_2006_donor = IF(exs.cnt_2006 0, 1, 0),
-ex.is_2007_donor = IF(exs.cnt_2007 0, 1, 0),
-ex.is_2008_donor = IF(exs.cnt_2008 0, 1, 0),
-ex.is_2009_donor = IF(exs.cnt_2009 0, 1, 0),
-ex.is_2010_donor = IF(exs.cnt_2010 0, 1, 0),
-ex.is_2011_donor = IF(exs.cnt_2011 0, 1, 0),
-ex.is_2012_donor = IF(exs.cnt_2012 0, 1, 0),
-ex.is_2013_donor = IF(exs.cnt_2013 0, 1, 0),
-ex.is_2014_donor = IF(exs.cnt_2014 0, 1, 0)
+ex.has_recurred_donation = IF(exs.has_recurred_donation 0, 1, 0)
WHERE
ex.id = exs.exid;
@@ -276,14 +236,6 @@
highest_usd_amount = 0,
lifetime_usd_total = 0,
donation_count = 0,
-is_2007_donor = 0,
-is_2008_donor = 0,
-is_2009_donor = 0,
-is_2010_donor = 0,
-is_2011_donor = 0,
-is_2012_donor = 0,
-is_2013_donor = 0,
-is_2014_donor = 0,
latest_currency = 'USD',
latest_native_amount = 0,
latest_usd_amount = 0,
@@ -310,18 +262,8 @@
highest_usd_amount decimal(20,2),
lifetime_usd_total decimal(20,2),
donation_count int,
- is_2006_donor tinyint(1),
- is_2007_donor tinyint(1),
- is_2008_donor tinyint(1),
- is_2009_donor tinyint(1),
- is_2010_donor tinyint(1),
- is_2011_donor tinyint(1),
- is_2012_donor tinyint(1),
- is_2013_donor tinyint(1),
- is_2014_donor
[MediaWiki-commits] [Gerrit] Use shared context in distance to goal - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/197845
Change subject: Use shared context in distance to goal
..
Use shared context in distance to goal
Display an error message if no widget exists to provide totals.
Change-Id: I84c84b6213fe28070e759215f6c2c7b54d20e292
---
M src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.html
M src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
2 files changed, 26 insertions(+), 65 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/45/197845/1
diff --git
a/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.html
b/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.html
index 78983e9..b74b42f 100644
--- a/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.html
+++ b/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.html
@@ -4,6 +4,7 @@
p data-bind=text: title/p
/div
div class=panel-body
+ p data-bind=visible: !hasData()No data available.
This widget requires a widget like Totals Earned to provide data./p
div class=row-fluid
div class=col-md-12
div id=distanceToGoalChart
width='1000' height='450'/div
diff --git
a/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
b/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
index 8ce31e1..2a16254 100644
--- a/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
+++ b/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
@@ -2,79 +2,33 @@
'knockout',
'text!components/widgets/distance-to-goal-chart/distance-to-goal-chart.html',
'c3',
- 'momentjs'
-], function( ko, template, c3, moment ){
-
+ 'WidgetBase'
+], function( ko, template, c3, WidgetBase ){
function DistanceToGoalChartViewModel( params ){
var self = this;
- self.goal = ko.observable('20,000,000');
- self.dailyDataArray = [ 'Daily Total' ];
+ WidgetBase.call( this, params );
+ self.hasData = ko.observable( false );
- self.loadData = function ( decemberData, timestamp ) {
- var runningTotal = 0,
- currentDate = new Date(),
- timeFormat = ', Do , h:mm:ss a';
- currentDate.setTime( timestamp );
- self.displayDate( moment( currentDate ).format(
timeFormat ) );
- self.lastDataPoint.day = currentDate.getUTCDate();
- self.lastDataPoint.hour = currentDate.getUTCHours();
-
- for (var d = 1; d 32; d++) {
- self.dailyDataArray[d] = 0;
- self.dailyCountArray[d] = 0;
- if (!self.dayObj[d]) {
- self.dayObj[d] = new Array(25);
- self.dayObj[d][0] = 'Hourly Totals';
- for (var h = 0; h 24; h++) {
- self.dayObj[d][h + 1] = {
total: 0, count: 0 };
-
self.secondsByHourDonationData[(d - 1) * 24 + h + 1] = 0;
- }
- }
- }
-
- var dataCount = decemberData.length;
- for (var i = 0; i dataCount; i++ ) {
-
- var el = decemberData[i],
- day = el.day,
- hour = el.hour,
- total = el.usd_total;
- self.dayObj[day][hour + 1] = { total: total,
count: el.donations };
-
- self.secondsByHourDonationData[(day - 1) * 24 +
hour + 1] = el.usd_per_second;
- runningTotal += total;
- self.dailyDataArray[day] += total;
- self.dailyCountArray[day] += el.donations;
- }
-
- //self.makeCharts();
-
- self.raised(runningTotal);
- };
-
- // $.get('data/big-english', function(dtgData){
-
- // console.log('dtgData', dtgData);
-
- // self.dailyDataArray;
-
-
- // });
-
- self.title = ko.observable(params.title);
self.makeCharts = function() {
-
[MediaWiki-commits] [Gerrit] Fix board links when on library page - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/197852
Change subject: Fix board links when on library page
..
Fix board links when on library page
Change-Id: Ice0cfdd3951eaa9e65c0f6c5948a21414df46f25
---
M src/components/app-content/app-content.js
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/52/197852/1
diff --git a/src/components/app-content/app-content.js
b/src/components/app-content/app-content.js
index 24ecfa0..b96d969 100644
--- a/src/components/app-content/app-content.js
+++ b/src/components/app-content/app-content.js
@@ -96,6 +96,7 @@
self.displayPage($.trim($(data.target).text()));
} else {
$.get( 'board/' + view, function( bdata ){
+ self.displayPage('Home');
self.displayedBoard( bdata );
});
}
--
To view, visit https://gerrit.wikimedia.org/r/197852
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice0cfdd3951eaa9e65c0f6c5948a21414df46f25
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use shared context in amount per second - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/197848
Change subject: Use shared context in amount per second
..
Use shared context in amount per second
Also change y ticks to include cents, for use in smaller campaigns.
Bug: T89298
Change-Id: I867b741cddaaaec16bf7d4a25bac6e29a6a9be4b
---
M src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
M src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
2 files changed, 38 insertions(+), 60 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/48/197848/1
diff --git
a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
index 71185d3..2443393 100644
--- a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
+++ b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
@@ -4,6 +4,7 @@
pUSD/Second Required (Average)/p
/div
div class=panel-body
+ p data-bind=visible: !hasData()No data available.
This widget requires a widget like Totals Earned to provide data./p
div class=col-md-12
div id=avgUSDperSecond/div
/div
diff --git
a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
index e48d9db..f009e35 100644
--- a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
+++ b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
@@ -3,81 +3,41 @@
'text!components/widgets/amt-per-second-chart/amt-per-second-chart.html',
'c3',
'numeraljs',
- 'momentjs'
-], function( ko, template, c3, numeral, moment ){
-
+ 'WidgetBase'
+], function( ko, template, c3, numeral, WidgetBase ){
function AmtPerSecondChartViewModel( params ){
var self = this;
-
- //TODO: make dayObj (and other params) come from data
- self.dayObj = [];
-
- self.loadData = function ( decemberData, timestamp ) {
- var runningTotal = 0,
- currentDate = new Date(),
- timeFormat = ', Do , h:mm:ss a';
-
- currentDate.setTime( timestamp );
- self.displayDate( moment( currentDate ).format(
timeFormat ) );
- self.lastDataPoint.day = currentDate.getUTCDate();
- self.lastDataPoint.hour = currentDate.getUTCHours();
-
- for (var d = 1; d 32; d++) {
- self.dailyDataArray[d] = 0;
- self.dailyCountArray[d] = 0;
- if (!self.dayObj[d]) {
- self.dayObj[d] = new Array(25);
- self.dayObj[d][0] = 'Hourly Totals';
- for (var h = 0; h 24; h++) {
- self.dayObj[d][h + 1] = {
total: 0, count: 0 };
-
self.secondsByHourDonationData[(d - 1) * 24 + h + 1] = 0;
- }
- }
- }
-
- var dataCount = decemberData.length;
- for (var i = 0; i dataCount; i++ ) {
-
- var el = decemberData[i],
- day = el.day,
- hour = el.hour,
- total = el.usd_total;
- self.dayObj[day][hour + 1] = { total: total,
count: el.donations };
-
- self.secondsByHourDonationData[(day - 1) * 24 +
hour + 1] = el.usd_per_second;
- runningTotal += total;
- self.dailyDataArray[day] += total;
- self.dailyCountArray[day] += el.donations;
- }
-
- self.raised(runningTotal);
- };
+ WidgetBase.call( this, params );
+ self.hasData = ko.observable( false );
self.makeChart = function() {
- if ( self.dayObj.length 2 ) {
+ var columns;
+
+ if ( params.sharedContext.dayObj.length 2 ) {
return;
}
- var numPoints = ( self.lastDataPoint.day - 1 ) * 24 +
self.lastDataPoint.hour + 1,
+ self.hasData( true );
+
[MediaWiki-commits] [Gerrit] Make a C3 knockout binding - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/198148
Change subject: Make a C3 knockout binding
..
Make a C3 knockout binding
We need this in order to put multiple charts of the same type on the same page,
so
we're not binding each chart to a specific element id.
Change-Id: I02119e11585e88e392d7c87509c5753bb58c1dfe
---
M src/app/bindings.js
M src/app/startup.js
M src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
M src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
4 files changed, 48 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/48/198148/1
diff --git a/src/app/bindings.js b/src/app/bindings.js
index e69de29..b74f752 100644
--- a/src/app/bindings.js
+++ b/src/app/bindings.js
@@ -0,0 +1,37 @@
+define( [
+ 'knockout',
+ 'c3'
+], function( ko, c3 ) {
+ ko.bindingHandlers.c3 = {
+ init: function init( element, valueAccessor,
allBindingsAccessor, viewModel, bindingContext ) {
+ var chart, options = ko.unwrap( valueAccessor() );
+ if ( !options ) {
+ return;
+ }
+ options.bindto = element;
+ chart = c3.generate(options);
+ ko.utils.domNodeDisposal.addDisposeCallback( element,
function() {
+ chart.destroy();
+ });
+ ko.utils.domData.set( element, 'chart', chart );
+ },
+ update: function update( element, valueAccessor,
allBindingsAccessor, viewModel, bindingContext ) {
+ var chart = ko.utils.domData.get( element, 'chart' ),
+ options = ko.unwrap(valueAccessor());
+ if ( !options ) {
+ return;
+ }
+ if ( chart ) {
+ chart.load( options.data );
+ return;
+ }
+ options.bindto = element;
+ chart = c3.generate(options);
+ ko.utils.domNodeDisposal.addDisposeCallback( element,
function() {
+ chart.destroy();
+ });
+ ko.utils.domData.set( element, 'chart', chart );
+ }
+ };
+ return true;
+} );
\ No newline at end of file
diff --git a/src/app/startup.js b/src/app/startup.js
index e6cc743..345c5ca 100644
--- a/src/app/startup.js
+++ b/src/app/startup.js
@@ -3,10 +3,9 @@
'knockout',
'./router',
'bootstrap',
- 'knockout-projections'
- //'./bindings'
+ 'knockout-projections',
+ './bindings'
], function( $, ko, router ){
-
ko.components.register( 'dashboard', { require:
'components/dashboard/dashboard' });
ko.components.register( 'home', { require:
'components/home/home' });
ko.components.register( 'nav-bar',{ require:
'components/nav-bar/nav-bar' });
diff --git
a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
index 56091db..85733aa 100644
--- a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
+++ b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
@@ -6,7 +6,7 @@
div class=panel-body
p data-bind=visible: !hasData()No data available.
This widget requires a widget like Totals Earned to provide data./p
div class=col-md-12
- div id=avgUSDperSecond/div
+ div id=avgUSDperSecond data-bind=c3:
avgUSDperSecondChart/div
/div
/div
/div
diff --git
a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
index a4711e8..19865f4 100644
--- a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
+++ b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
@@ -11,10 +11,9 @@
var self = this;
WidgetBase.call( this, params );
self.hasData = ko.observable( false );
+ self.avgUSDperSecondChart = ko.observable( false );
self.makeChart = function() {
- var columns;
-
if ( params.sharedContext.dayObj.length 2 ) {
return;
}
@@ -54,21 +53,8 @@
self.gotPerSecond[ numPoints + 1 ] =
[MediaWiki-commits] [Gerrit] Format smaller amounts of needed money more nicely - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/198147
Change subject: Format smaller amounts of needed money more nicely
..
Format smaller amounts of needed money more nicely
No longer fractions of a million
Change-Id: Ied15165877b1d5e420e44eeccc6d5043ba5685b9
---
M src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/47/198147/1
diff --git
a/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
b/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
index 0f7df22..6e71c06 100644
--- a/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
+++ b/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
@@ -2,8 +2,9 @@
'knockout',
'text!components/widgets/distance-to-goal-chart/distance-to-goal-chart.html',
'c3',
+ 'numeraljs',
'WidgetBase'
-], function( ko, template, c3, WidgetBase ){
+], function( ko, template, c3, numeral, WidgetBase ){
function DistanceToGoalChartViewModel( params ){
@@ -62,7 +63,7 @@
position: 'outer-middle'
},
tick: {
- format: function(x){
return '$' + x/100 + 'm'; }
+ format: function(x){
return numeral(x).format( '$0.[00]a' ); }
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/198147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied15165877b1d5e420e44eeccc6d5043ba5685b9
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix board-level loading modal - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/198128
Change subject: Fix board-level loading modal
..
Fix board-level loading modal
TODO: Still using the bootstrappy functions like was in the x-by-y
widget instead of doing it more knockouty.
Change-Id: I7f942aa9399fe61994fb5c1c3b743aca1b839ea8
---
M src/app/widgetBase.js
M src/components/boards/generic-board/generic-board.html
M src/components/boards/generic-board/generic-board.js
M src/components/widgets/x-by-y/x-by-y.html
M src/components/widgets/x-by-y/x-by-y.js
5 files changed, 33 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/28/198128/1
diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index fd19cc8..4a395d0 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -21,7 +21,7 @@
self.instanceID = params.widgetInstance;
self.widgetCode = params.widgetCode;
self.preDataLoading = ko.observable(true);
- self.dataLoading=
ko.observable(!!params.configuration);
+ self.dataLoading= params.dataLoading;
self.chartSaved =
ko.observable(!!params.configuration);
self.optionStateChanged = ko.observable(false);
self.chartWidth = ko.observable('900');
@@ -34,6 +34,7 @@
return $.ajax({
url: '/data/' + self.widgetCode + '?' + ( qs
).replace( /\+/g, '%20' ),
success: function ( dataget ) {
+ self.dataLoading(false);
self.retrievedResults( dataget.results
);
self.queryStringSQL( dataget.sqlQuery );
}
diff --git a/src/components/boards/generic-board/generic-board.html
b/src/components/boards/generic-board/generic-board.html
index 9dd8d2f..5484460 100644
--- a/src/components/boards/generic-board/generic-board.html
+++ b/src/components/boards/generic-board/generic-board.html
@@ -12,15 +12,20 @@
/div
/div
-span data-bind=if: dataLoading
-div class=loading
-img src=/images/catloader.gif /
-divLoading Dashspan class=ellipsis data-bind=text:
ellipsis/span/div
-/div
-/span
-
div class=row data-bind=foreach: displayedBoard().widgets
-div data-bind=component: { name: widgetCode, params: { title:
displayName, description: description, configuration: configuration,
widgetInstance: id, widgetCode: widgetCode, sharedContext:
$parent.sharedContext } }span data-bind=text: display_name/span/div
+div data-bind=component: { name: widgetCode, params: { title:
displayName, description: description, configuration: configuration,
widgetInstance: id, widgetCode: widgetCode, dataLoading: dataLoading,
sharedContext: $parent.sharedContext } }span data-bind=text:
display_name/span/div
/div
+/div
+
+div class=modal fade id=loadingModal
+ div class=modal-dialog
+ div class=modal-content
+ h3 class=modal-bodyChart Loading/h3
+ div class=progress
+ div class=progress-bar progress-bar-success
progress-bar-striped active role=progressbar aria-valuenow=100
aria-valuemin=0 aria-valuemax=100 style=width: 100%
+ /div
+ /div
+ /div!-- /.modal-content --
+ /div
/div
\ No newline at end of file
diff --git a/src/components/boards/generic-board/generic-board.js
b/src/components/boards/generic-board/generic-board.js
index fb3fa04..2c24952 100644
--- a/src/components/boards/generic-board/generic-board.js
+++ b/src/components/boards/generic-board/generic-board.js
@@ -14,9 +14,25 @@
self.sharedContext = {};
self.displayedBoard = params.displayedBoard;
+ self.widgetLoads = [];
+ $.each( self.displayedBoard().widgets, function( i, widget ) {
+ widget.dataLoading = ko.observable( false );
+ self.widgetLoads.push( widget.dataLoading );
+ } );
-//make this false until data loading has been written
-self.dataLoading = ko.observable(false);
+//This will return true if any child widget is loading
+self.dataLoading = ko.computed( function() {
+ console.log('recalculating loading');
+ var i, widgetCount = self.widgetLoads.length;
+ for ( i = 0; i widgetCount; i++ ) {
+ if ( self.widgetLoads[i]() === true ) {
+
[MediaWiki-commits] [Gerrit] Fix default board id on first login - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/198422
Change subject: Fix default board id on first login
..
Fix default board id on first login
Change-Id: Iee0c31ef05378c33d4343298e41cc635cc0d9309
---
M persistence.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/22/198422/1
diff --git a/persistence.js b/persistence.js
index dd1c098..fda60f5 100644
--- a/persistence.js
+++ b/persistence.js
@@ -67,7 +67,7 @@
}
// If user doesn't have a default board, insert
one now
return connection.query( insertBoard, [
'Default dashboard for ' + user.displayName, userId, userId ] ).then( function(
dbResults ) {
- user.defaultBoard = dbResults[0].id;
+ user.defaultBoard =
dbResults[0][2][0].id;
});
});
});
--
To view, visit https://gerrit.wikimedia.org/r/198422
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee0c31ef05378c33d4343298e41cc635cc0d9309
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reduce session-enforcement copypasta - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/197997
Change subject: Reduce session-enforcement copypasta
..
Reduce session-enforcement copypasta
Use a middleware function instead of copy-pasting the login check
everywhere.
Change-Id: I789e0570fc74d97eecc2c2d170e2593fa5833664
---
M routes/board.js
M routes/data.js
M routes/user.js
M routes/widget.js
M server.js
5 files changed, 22 insertions(+), 49 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/97/197997/1
diff --git a/routes/board.js b/routes/board.js
index 835cd15..17030bd 100644
--- a/routes/board.js
+++ b/routes/board.js
@@ -2,10 +2,6 @@
module.exports = {
save: function( req, res ) {
- if ( !req.session || !req.session.passport ||
!req.session.passport.user ) {
- res.json( { error: 'Error: Not logged in' } );
- return;
- }
var board = {
ownerId: req.session.passport.user.localId,
displayName: req.body.displayName,
@@ -23,10 +19,6 @@
});
},
get: function( req, res ) {
- if ( !req.session || !req.session.passport ||
!req.session.passport.user ) {
- res.json( { error: 'Error: Not logged in' } );
- return;
- }
persistence.getBoard( req.params.id,
req.session.passport.user.localId ).then( function( board ) {
res.json( board );
}, function( error ) {
diff --git a/routes/data.js b/routes/data.js
index 7dcee8e..6766dc5 100644
--- a/routes/data.js
+++ b/routes/data.js
@@ -250,11 +250,6 @@
result,
cacheKey;
- if ( !req.session || !req.session.passport ||
!req.session.passport.user ) {
- res.json( { error: 'Error: Not logged in' } );
- return;
- }
-
if ( !widget ) {
res.json( { error: 'Error: ' + req.params.widget + ' is not a
valid widget' } );
return;
diff --git a/routes/user.js b/routes/user.js
index 4917755..51c2430 100644
--- a/routes/user.js
+++ b/routes/user.js
@@ -2,11 +2,6 @@
module.exports = {
info: function( req, res ) {
- if ( !req.session || !req.session.passport ||
!req.session.passport.user ) {
- res.json( false );
- return;
- }
-
var user = req.session.passport.user;
res.json( {
@@ -19,11 +14,6 @@
} );
},
boards: function( req, res ) {
- if ( !req.session || !req.session.passport ||
!req.session.passport.user ) {
- res.json( { error: 'Error: Not logged in' } );
- return;
- }
-
persistence.listBoards( req.session.passport.user.localId
).then( function( boards ) {
res.json( boards );
}, function( error ) {
@@ -31,11 +21,6 @@
});
},
widgetInstances: function( req, res ) {
- if ( !req.session || !req.session.passport ||
!req.session.passport.user ) {
- res.json( { error: 'Error: Not logged in' } );
- return;
- }
-
persistence.listWidgetInstances(
req.session.passport.user.localId ).then( function( instances ) {
res.json( instances );
}, function( error ) {
diff --git a/routes/widget.js b/routes/widget.js
index 48c5985..a999acb 100644
--- a/routes/widget.js
+++ b/routes/widget.js
@@ -7,10 +7,6 @@
});
},
saveInstance: function( req, res ) {
- if ( !req.session || !req.session.passport ||
!req.session.passport.user ) {
- res.json( { error: 'Error: Not logged in' } );
- return;
- }
var instance = {
widgetId: req.body.widgetId,
ownerId: req.session.passport.user.localId,
@@ -29,10 +25,6 @@
});
},
getInstance: function( req, res ) {
- if ( !req.session || !req.session.passport ||
!req.session.passport.user ) {
- res.json( { error: 'Error: Not logged in' } );
- return;
- }
persistence.getWidgetInstance( req.params.id,
req.session.passport.user.localId ).then( function( instance ) {
res.json( instance );
}, function( error ) {
diff --git a/server.js b/server.js
index 13663ce..53599d3 100644
--- a/server.js
+++ b/server.js
@@ -9,7 +9,8 @@
config = require( './config.js' ),
persistence
[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (mediawiki...DonationInterface)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/197690
Change subject: Merge branch 'master' into deployment
..
Merge branch 'master' into deployment
bbf5839 Don't fraud-fail on STATUSID 25
b26ca65 Localisation updates from https://translatewiki.net.
c5bbe27 Localisation updates from https://translatewiki.net.
Change-Id: Ib40a80a689e4205485e2694d0cd1bf68a9443ac3
---
D tests/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
D tests/Adapter/GlobalCollect/GlobalCollectTest.php
D tests/includes/Responses/globalcollect/GET_ORDERSTATUS_25.testresponse
D tests/includes/Responses/globalcollect/SET_PAYMENT_25.testresponse
4 files changed, 0 insertions(+), 704 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/90/197690/1
diff --git a/tests/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
b/tests/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
deleted file mode 100644
index 01526c8..000
--- a/tests/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
+++ /dev/null
@@ -1,173 +0,0 @@
- HEAD (877580 Merge branch 'master' into deployment)
-===
-?php
-
-/**
- * Wikimedia Foundation
- *
- * LICENSE
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */
-use Psr\Log\LogLevel;
-
-/**
- *
- * @group Fundraising
- * @group DonationInterface
- * @group GlobalCollect
- * @group OrphanSlayer
- */
-class DonationInterface_Adapter_GlobalCollect_Orphans_GlobalCollectTest
extends DonationInterfaceTestCase {
-
- /**
-* @param $name string The name of the test case
-* @param $data array Any parameters read from a dataProvider
-* @param $dataName string|int The name or index of the data set
-*/
- function __construct( $name = null, array $data = array(), $dataName =
'' ) {
- parent::__construct( $name, $data, $dataName );
- $this-testAdapterClass = 'TestingGlobalCollectOrphanAdapter';
- $this-dummy_utm_data = array (
- 'utm_source' = 'dummy_source',
- 'utm_campaign' = 'dummy_campaign',
- 'utm_medium' = 'dummy_medium',
- 'date' = time(),
- );
- }
-
- public function testConstructor() {
-
- $options = $this-getDonorTestData();
- $class = $this-testAdapterClass;
-
- $gateway = $this-getFreshGatewayObject();
-
- $this-assertInstanceOf( $class, $gateway );
-
- $this-verifyNoLogErrors();
- }
-
-
- public function testBatchOrderID_generate() {
-
- //no data on construct, generate Order IDs
- $gateway = $this-getFreshGatewayObject( null, array (
'order_id_meta' = array ( 'generate' = TRUE ) ) );
- $this-assertTrue( $gateway-getOrderIDMeta( 'generate' ), 'The
order_id meta generate setting override is not working properly. Order_id
generation may be broken.' );
- $this-assertNotNull( $gateway-getData_Unstaged_Escaped(
'order_id' ), 'Failed asserting that an absent order id is not left as null,
when generating our own' );
-
- $data = array_merge( $this-getDonorTestData(),
$this-dummy_utm_data );
- $data['order_id'] = '5';
-
- //now, add data and check that we didn't kill the oid. Still
generating.
- $gateway-loadDataAndReInit( $data, $useDB = false );
- $this-assertEquals( $gateway-getData_Unstaged_Escaped(
'order_id' ), '5', 'loadDataAndReInit failed to stick OrderID' );
-
- $data['order_id'] = '44';
- $gateway-loadDataAndReInit( $data, $useDB = false );
- $this-assertEquals( $gateway-getData_Unstaged_Escaped(
'order_id' ), '44', 'loadDataAndReInit failed to stick OrderID' );
-
- $this-verifyNoLogErrors();
- }
-
- public function testBatchOrderID_no_generate() {
-
- //no data on construct, do not generate Order IDs
- $gateway = $this-getFreshGatewayObject( null, array (
'order_id_meta' = array ( 'generate' = FALSE ) ) );
- $this-assertFalse( $gateway-getOrderIDMeta( 'generate' ),
'The order_id meta generate setting override is not working properly. Deferred
order_id generation may be broken.' );
- $this-assertNull(
[MediaWiki-commits] [Gerrit] DI submodule bump for deploy - change (mediawiki/core)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/197692 Change subject: DI submodule bump for deploy .. DI submodule bump for deploy Change-Id: I0d88a8275c5388e5a23471a3da5aa0b9f3297daa --- M extensions/DonationInterface 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/92/197692/1 diff --git a/extensions/DonationInterface b/extensions/DonationInterface index 8775804..9280151 16 --- a/extensions/DonationInterface +++ b/extensions/DonationInterface -Subproject commit 8775804d770cd85f1243b745e18313b0f2c56d0f +Subproject commit 92801515da37654cfb5ab62eac002cff9c4e1975 -- To view, visit https://gerrit.wikimedia.org/r/197692 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0d88a8275c5388e5a23471a3da5aa0b9f3297daa Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_23 Gerrit-Owner: Ejegg eeggles...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fraud gauge widget refactor - change (wikimedia...dash)
Ejegg has submitted this change and it was merged.
Change subject: Fraud gauge widget refactor
..
Fraud gauge widget refactor
fixed saving
fixed to use logStateChange
fixed linting errors.
PS: I can't figure out why the save button doesn't logically hide on
first load. Ideas?
Change-Id: I97821c63e25ab10bc08ea3cb5ea5de0204eb0db0
---
M src/app/widgetBase.js
M src/bower_modules
M src/components/widgets/fraud-gauge/fraud-gauge.html
M src/components/widgets/fraud-gauge/fraud-gauge.js
M src/css/style.css
5 files changed, 284 insertions(+), 275 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index ba71d70..92b46b7 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -16,6 +16,7 @@
self.retrievedResults = ko.observable();
self.queryStringSQL = ko.observable('This widget hasn\'t
been set up yet!');
+ self.tempConfig = ko.observable();
self.config = params.configuration || {};
self.instanceID = params.widgetInstance;
self.widgetCode = params.widgetCode;
@@ -39,6 +40,7 @@
};
self.saveWidgetConfig = function(){
+
if( self.instanceID ){
$.ajax({
method: 'PUT',
@@ -50,6 +52,7 @@
}),
success: function( data ) {
self.chartSaved(true);
+ self.logStateChange(false);
}
});
} else {
@@ -64,6 +67,7 @@
success: function( data ) {
self.instanceID = data.id;
self.chartSaved(true);
+ self.logStateChange(false);
}
});
}
diff --git a/src/bower_modules b/src/bower_modules
index 1323394..2a4a5f0 16
--- a/src/bower_modules
+++ b/src/bower_modules
-Subproject commit 132339455dc0bf26fe7599f2bb57c70800f92b9f
+Subproject commit 2a4a5f03b54988ec09e76ef69362c39655481918
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.html
b/src/components/widgets/fraud-gauge/fraud-gauge.html
index e3b9fed..ccd42ec 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.html
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.html
@@ -1,11 +1,13 @@
div class=row
-div data-bind=attr: {class: columnSize}
+div data-bind=attr: { class: columnSize }
div class=panel panel-purple id=fraudGaugeWidget
div class=panel-heading
span data-bind='text: title'/span
div class=btn-group btn-group-xs pull-right
button type=button class=btn btn-default dropdown-toggle
data-toggle=modal data-target=#sqlModali class=fa
fa-database/i/button
-button type=button class=btn btn-default
data-toggle=modal data-target=#modifyModali class=fa
fa-edit/i/button
+button type=button class=btn btn-default
data-toggle=modal data-target=#modifyModal data-bind=click:
renderPercentRangeCharti class=fa fa-edit/i/button
+button type=button class=btn btn-danger
data-bind=visible: !chartSaved() optionStateChanged, click:
saveWidgetConfigi class=fa fa-save/i/button
+button type=button class=btn btn-success
data-bind=visible: chartSaved !optionStateChanged()i class=fa
fa-save/i Saved/button
/div
/div
div class=panel-body
@@ -14,14 +16,14 @@
div class=gauge
div class=row
-h3 class=text-center data-bind=visible:
gaugeIsSetUp(), text: selectedTimePeriod/h3
+h3 class=text-center data-bind=visible: configSet,
text: selectedTimePeriod/h3
/div
-div class=row id=specifiedFraudGauge
data-bind=visible: gaugeIsSetUp
+div class=row id=specifiedFraudGauge
data-bind=visible: configSet
div id=FraudRiskScoreGauge/div
/div
-div class=row id=unspecifiedFraudGauge
data-bind=visible: !gaugeIsSetUp()
+div class=row id=unspecifiedFraudGauge
data-bind=visible: !configSet()
div class=col-md-12
div class=setupAsk
h3This widget hasn't been set up yet./h3
@@ -30,7 +32,7 @@
/div
[MediaWiki-commits] [Gerrit] Redo bower_modules update - change (wikimedia...dash)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/198089 Change subject: Redo bower_modules update .. Redo bower_modules update Change-Id: Id289407b8a3184ecc284e643b0b692513d057cf2 --- M src/bower_modules 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/89/198089/1 diff --git a/src/bower_modules b/src/bower_modules index 2a4a5f0..1323394 16 --- a/src/bower_modules +++ b/src/bower_modules -Subproject commit 2a4a5f03b54988ec09e76ef69362c39655481918 +Subproject commit 132339455dc0bf26fe7599f2bb57c70800f92b9f -- To view, visit https://gerrit.wikimedia.org/r/198089 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id289407b8a3184ecc284e643b0b692513d057cf2 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: master Gerrit-Owner: Ejegg eeggles...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add RESTful add/delete widget routes - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/198093
Change subject: Add RESTful add/delete widget routes
..
Add RESTful add/delete widget routes
No longer need to gather and re-send all board data just to add
or delete a widget instance.
To add, POST { instanceId: 23 } to /board/5/widgets
To delete, DELETE /board/5/widgets/23
Change-Id: I729cc92d3b33af874f75bcabfd3ec0374f97eb05
---
M persistence.js
M routes/board.js
M server.js
M src/components/app-content/app-content.js
4 files changed, 55 insertions(+), 38 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/93/198093/1
diff --git a/persistence.js b/persistence.js
index be17205..dd1c098 100644
--- a/persistence.js
+++ b/persistence.js
@@ -169,12 +169,22 @@
saveBoard: function( board ) {
var connection = getConnection(),
insert = 'INSERT INTO dash_board ( owner_id,
display_name, description, is_shared ) VALUES ( ?, ?, ?, ? )',
+ addWidget = 'INSERT INTO dash_widget_instance_board (
instance_id, board_id, widget_position ) SELECT ?, b.id, COALESCE( MAX(
widget_position ), 0 ) + 1 FROM dash_board b LEFT JOIN
dash_widget_instance_board i ON b.id = i.board_id WHERE b.id = ? AND b.owner_id
= ?',
+ addWidgetParams = [ board.addWidget, board.id,
board.ownerId ],
+ deleteWidget = 'DELETE FROM dash_widget_instance_board
WHERE instance_id = ? AND board_id = ? AND EXISTS( SELECT 1 FROM dash_board
WHERE id = ? AND owner_id = ? )',
+ deleteWidgetParams = [ board.deleteWidget, board.id,
board.id, board.ownerId ],
insertParams = [ board.ownerId, board.displayName,
board.description, board.isShared ? 1 : 0 ],
update = 'UPDATE dash_board set display_name = ?,
description = ?, is_shared = ? WHERE id = ? AND owner_id = ?',
updateParams = [ board.displayName, board.description,
board.isShared ? 1 : 0, board.id, board.ownerId ],
deleteWidgets = 'DELETE FROM dash_widget_instance_board
WHERE board_id = ?';
if ( board.id ) {
+ if ( board.addWidget ) {
+ return connection.query( addWidget,
addWidgetParams );
+ }
+ if ( board.deleteWidget ) {
+ return connection.query( deleteWidget,
deleteWidgetParams );
+ }
return connection.query( update, updateParams ).then(
function( dbResults ) {
if ( dbResults[0].affectedRows !== 1 ) {
// Either the board doesn't exist or
it's not ours
diff --git a/routes/board.js b/routes/board.js
index 17030bd..d8e3727 100644
--- a/routes/board.js
+++ b/routes/board.js
@@ -24,5 +24,25 @@
}, function( error ) {
res.json( { error: error } );
});
+ },
+ addWidget: function( req, res ) {
+ var board = {
+ ownerId: req.session.passport.user.localId,
+ id: req.params.id,
+ addWidget: req.body.instanceId
+ };
+ persistence.saveBoard( board ).then( function() {
+ res.json( { success: true, id: board.id } );
+ } );
+ },
+ deleteWidget: function( req, res ) {
+ var board = {
+ ownerId: req.session.passport.user.localId,
+ id: req.params.id,
+ deleteWidget: req.params.instanceId
+ };
+ persistence.saveBoard( board ).then( function() {
+ res.json( { success: true, id: board.id } );
+ } );
}
};
diff --git a/server.js b/server.js
index fbea8a9..7a8d077 100644
--- a/server.js
+++ b/server.js
@@ -91,6 +91,8 @@
app.post( '/board', loginCheck, routes.board.save );
app.put( '/board/:id', loginCheck, routes.board.save );
app.get( '/board/:id', loginCheck, routes.board.get );
+app.post( '/board/:id/widgets', loginCheck, routes.board.addWidget );
+app.delete( '/board/:id/widgets/:instanceId', loginCheck,
routes.board.deleteWidget );
/*jslint -W024*/
app.use( express.static( __dirname + ( config.debug ? '/src' : '/dist' ) ) );
diff --git a/src/components/app-content/app-content.js
b/src/components/app-content/app-content.js
index 24ecfa0..2c52b32 100644
--- a/src/components/app-content/app-content.js
+++ b/src/components/app-content/app-content.js
@@ -38,52 +38,37 @@
});
self.addWidgetToBoard = function( event, data ){
-var widgetIDToAdd;
-
-$.ajax({
+$.ajax( {
method: 'POST',
[MediaWiki-commits] [Gerrit] Revert Add knockout-bootstrap and update dependencies - change (wikimedia...bower_modules)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/198391 Change subject: Revert Add knockout-bootstrap and update dependencies .. Revert Add knockout-bootstrap and update dependencies This library turns out not to do the stuff we need. This reverts commit e554ed28cca9d593a3edf293103f3ad4ca724719. Change-Id: I4995255825bcd73a23cffc1b242eb02c3179c4c2 --- M bootstrap/.bower.json M bootstrap/Gruntfile.js M bootstrap/LICENSE M bootstrap/README.md M bootstrap/bower.json M bootstrap/dist/css/bootstrap-theme.css M bootstrap/dist/css/bootstrap-theme.css.map M bootstrap/dist/css/bootstrap-theme.min.css M bootstrap/dist/css/bootstrap.css M bootstrap/dist/css/bootstrap.css.map M bootstrap/dist/css/bootstrap.min.css M bootstrap/dist/fonts/glyphicons-halflings-regular.eot M bootstrap/dist/fonts/glyphicons-halflings-regular.svg M bootstrap/dist/fonts/glyphicons-halflings-regular.ttf M bootstrap/dist/fonts/glyphicons-halflings-regular.woff D bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 M bootstrap/dist/js/bootstrap.js M bootstrap/dist/js/bootstrap.min.js D bootstrap/dist/js/npm.js M bootstrap/fonts/glyphicons-halflings-regular.eot M bootstrap/fonts/glyphicons-halflings-regular.svg M bootstrap/fonts/glyphicons-halflings-regular.ttf M bootstrap/fonts/glyphicons-halflings-regular.woff D bootstrap/fonts/glyphicons-halflings-regular.woff2 D bootstrap/grunt/.jshintrc D bootstrap/grunt/bs-commonjs-generator.js M bootstrap/grunt/bs-glyphicons-data-generator.js M bootstrap/grunt/bs-lessdoc-parser.js D bootstrap/grunt/configBridge.json M bootstrap/grunt/sauce_browsers.yml D bootstrap/js/.jscsrc D bootstrap/js/.jshintrc M bootstrap/js/affix.js M bootstrap/js/alert.js M bootstrap/js/button.js M bootstrap/js/carousel.js M bootstrap/js/collapse.js M bootstrap/js/dropdown.js M bootstrap/js/modal.js M bootstrap/js/popover.js M bootstrap/js/scrollspy.js M bootstrap/js/tab.js M bootstrap/js/tooltip.js M bootstrap/js/transition.js D bootstrap/less/.csscomb.json D bootstrap/less/.csslintrc M bootstrap/less/alerts.less M bootstrap/less/badges.less M bootstrap/less/button-groups.less M bootstrap/less/buttons.less M bootstrap/less/carousel.less M bootstrap/less/close.less M bootstrap/less/code.less M bootstrap/less/component-animations.less M bootstrap/less/dropdowns.less M bootstrap/less/forms.less M bootstrap/less/glyphicons.less M bootstrap/less/jumbotron.less M bootstrap/less/list-group.less M bootstrap/less/media.less M bootstrap/less/mixins/buttons.less M bootstrap/less/mixins/forms.less M bootstrap/less/mixins/grid-framework.less M bootstrap/less/mixins/image.less M bootstrap/less/mixins/labels.less M bootstrap/less/mixins/vendor-prefixes.less M bootstrap/less/modals.less M bootstrap/less/navbar.less M bootstrap/less/navs.less M bootstrap/less/normalize.less M bootstrap/less/pager.less M bootstrap/less/pagination.less M bootstrap/less/panels.less M bootstrap/less/popovers.less M bootstrap/less/print.less M bootstrap/less/progress-bars.less M bootstrap/less/responsive-embed.less M bootstrap/less/scaffolding.less M bootstrap/less/tables.less M bootstrap/less/theme.less M bootstrap/less/thumbnails.less M bootstrap/less/tooltip.less M bootstrap/less/type.less M bootstrap/less/utilities.less M bootstrap/less/variables.less D bootstrap/package.js M bootstrap/package.json D knockout-bootstrap/.bower.json D knockout-bootstrap/Gruntfile.js D knockout-bootstrap/README.md D knockout-bootstrap/banner.txt D knockout-bootstrap/bower.json D knockout-bootstrap/build/knockout-bootstrap.min.js D knockout-bootstrap/examples/css/bootstrap.css D knockout-bootstrap/examples/css/bootstrap.css.map D knockout-bootstrap/examples/css/bootstrap.min.css D knockout-bootstrap/examples/css/docs.css D knockout-bootstrap/examples/css/prettify.css D knockout-bootstrap/examples/fonts/glyphicons-halflings-regular.eot D knockout-bootstrap/examples/fonts/glyphicons-halflings-regular.svg D knockout-bootstrap/examples/fonts/glyphicons-halflings-regular.ttf D knockout-bootstrap/examples/fonts/glyphicons-halflings-regular.woff D knockout-bootstrap/examples/img/bs-docs-masthead-pattern.png D knockout-bootstrap/examples/img/glyphicons-halflings-white.png D knockout-bootstrap/examples/img/glyphicons-halflings.png D knockout-bootstrap/examples/index.html D knockout-bootstrap/examples/js/bootstrap.js D knockout-bootstrap/examples/js/bootstrap.min.js D knockout-bootstrap/examples/js/knockout.js D knockout-bootstrap/examples/js/prettify.js D knockout-bootstrap/examples/js/typeahead.jquery.js D knockout-bootstrap/gulpfile.js D knockout-bootstrap/karma.conf.js D knockout-bootstrap/package.json D knockout-bootstrap/spec/test-spec.js D knockout-bootstrap/src/knockout-bootstrap.js D typeahead.js/.bower.json D typeahead.js/.gitignore D typeahead.js/.jshintrc D typeahead.js/.travis.yml D typeahead.js/CHANGELOG.md D typeahead.js/CONTRIBUTING.md D typeahead.js/Gruntfile.js D
[MediaWiki-commits] [Gerrit] Revert Add knockout-bootstrap and update dependencies - change (wikimedia...bower_modules)
Ejegg has submitted this change and it was merged. Change subject: Revert Add knockout-bootstrap and update dependencies .. Revert Add knockout-bootstrap and update dependencies This library turns out not to do the stuff we need. This reverts commit e554ed28cca9d593a3edf293103f3ad4ca724719. Change-Id: I4995255825bcd73a23cffc1b242eb02c3179c4c2 --- M bootstrap/.bower.json M bootstrap/Gruntfile.js M bootstrap/LICENSE M bootstrap/README.md M bootstrap/bower.json M bootstrap/dist/css/bootstrap-theme.css M bootstrap/dist/css/bootstrap-theme.css.map M bootstrap/dist/css/bootstrap-theme.min.css M bootstrap/dist/css/bootstrap.css M bootstrap/dist/css/bootstrap.css.map M bootstrap/dist/css/bootstrap.min.css M bootstrap/dist/fonts/glyphicons-halflings-regular.eot M bootstrap/dist/fonts/glyphicons-halflings-regular.svg M bootstrap/dist/fonts/glyphicons-halflings-regular.ttf M bootstrap/dist/fonts/glyphicons-halflings-regular.woff D bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 M bootstrap/dist/js/bootstrap.js M bootstrap/dist/js/bootstrap.min.js D bootstrap/dist/js/npm.js M bootstrap/fonts/glyphicons-halflings-regular.eot M bootstrap/fonts/glyphicons-halflings-regular.svg M bootstrap/fonts/glyphicons-halflings-regular.ttf M bootstrap/fonts/glyphicons-halflings-regular.woff D bootstrap/fonts/glyphicons-halflings-regular.woff2 D bootstrap/grunt/.jshintrc D bootstrap/grunt/bs-commonjs-generator.js M bootstrap/grunt/bs-glyphicons-data-generator.js M bootstrap/grunt/bs-lessdoc-parser.js D bootstrap/grunt/configBridge.json M bootstrap/grunt/sauce_browsers.yml D bootstrap/js/.jscsrc D bootstrap/js/.jshintrc M bootstrap/js/affix.js M bootstrap/js/alert.js M bootstrap/js/button.js M bootstrap/js/carousel.js M bootstrap/js/collapse.js M bootstrap/js/dropdown.js M bootstrap/js/modal.js M bootstrap/js/popover.js M bootstrap/js/scrollspy.js M bootstrap/js/tab.js M bootstrap/js/tooltip.js M bootstrap/js/transition.js D bootstrap/less/.csscomb.json D bootstrap/less/.csslintrc M bootstrap/less/alerts.less M bootstrap/less/badges.less M bootstrap/less/button-groups.less M bootstrap/less/buttons.less M bootstrap/less/carousel.less M bootstrap/less/close.less M bootstrap/less/code.less M bootstrap/less/component-animations.less M bootstrap/less/dropdowns.less M bootstrap/less/forms.less M bootstrap/less/glyphicons.less M bootstrap/less/jumbotron.less M bootstrap/less/list-group.less M bootstrap/less/media.less M bootstrap/less/mixins/buttons.less M bootstrap/less/mixins/forms.less M bootstrap/less/mixins/grid-framework.less M bootstrap/less/mixins/image.less M bootstrap/less/mixins/labels.less M bootstrap/less/mixins/vendor-prefixes.less M bootstrap/less/modals.less M bootstrap/less/navbar.less M bootstrap/less/navs.less M bootstrap/less/normalize.less M bootstrap/less/pager.less M bootstrap/less/pagination.less M bootstrap/less/panels.less M bootstrap/less/popovers.less M bootstrap/less/print.less M bootstrap/less/progress-bars.less M bootstrap/less/responsive-embed.less M bootstrap/less/scaffolding.less M bootstrap/less/tables.less M bootstrap/less/theme.less M bootstrap/less/thumbnails.less M bootstrap/less/tooltip.less M bootstrap/less/type.less M bootstrap/less/utilities.less M bootstrap/less/variables.less D bootstrap/package.js M bootstrap/package.json D knockout-bootstrap/.bower.json D knockout-bootstrap/Gruntfile.js D knockout-bootstrap/README.md D knockout-bootstrap/banner.txt D knockout-bootstrap/bower.json D knockout-bootstrap/build/knockout-bootstrap.min.js D knockout-bootstrap/examples/css/bootstrap.css D knockout-bootstrap/examples/css/bootstrap.css.map D knockout-bootstrap/examples/css/bootstrap.min.css D knockout-bootstrap/examples/css/docs.css D knockout-bootstrap/examples/css/prettify.css D knockout-bootstrap/examples/fonts/glyphicons-halflings-regular.eot D knockout-bootstrap/examples/fonts/glyphicons-halflings-regular.svg D knockout-bootstrap/examples/fonts/glyphicons-halflings-regular.ttf D knockout-bootstrap/examples/fonts/glyphicons-halflings-regular.woff D knockout-bootstrap/examples/img/bs-docs-masthead-pattern.png D knockout-bootstrap/examples/img/glyphicons-halflings-white.png D knockout-bootstrap/examples/img/glyphicons-halflings.png D knockout-bootstrap/examples/index.html D knockout-bootstrap/examples/js/bootstrap.js D knockout-bootstrap/examples/js/bootstrap.min.js D knockout-bootstrap/examples/js/knockout.js D knockout-bootstrap/examples/js/prettify.js D knockout-bootstrap/examples/js/typeahead.jquery.js D knockout-bootstrap/gulpfile.js D knockout-bootstrap/karma.conf.js D knockout-bootstrap/package.json D knockout-bootstrap/spec/test-spec.js D knockout-bootstrap/src/knockout-bootstrap.js D typeahead.js/.bower.json D typeahead.js/.gitignore D typeahead.js/.jshintrc D typeahead.js/.travis.yml D typeahead.js/CHANGELOG.md D typeahead.js/CONTRIBUTING.md D typeahead.js/Gruntfile.js D typeahead.js/LICENSE D
[MediaWiki-commits] [Gerrit] Fix widget loader tracking on board switch - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/198265
Change subject: Fix widget loader tracking on board switch
..
Fix widget loader tracking on board switch
Regenerate list of tracking observables whenever displayedBoard
changes. TODO: turn displayedBoard.widgets into an observable array
and track changes that way.
Change-Id: I838ddff5dd48ebc3be1f8d7cb12704e7fa792a5d
---
M src/components/boards/generic-board/generic-board.js
1 file changed, 15 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/65/198265/1
diff --git a/src/components/boards/generic-board/generic-board.js
b/src/components/boards/generic-board/generic-board.js
index 5d28730..fe9da85 100644
--- a/src/components/boards/generic-board/generic-board.js
+++ b/src/components/boards/generic-board/generic-board.js
@@ -14,17 +14,25 @@
self.sharedContext = {};
self.displayedBoard = params.displayedBoard;
-self.widgetLoads = [];
-$.each( self.displayedBoard().widgets, function( i, widget ) {
-widget.dataLoading = ko.observable( false );
-self.widgetLoads.push( widget.dataLoading );
-} );
+self.widgetLoads = ko.observableArray([]);
+ function setWidgetLoads() {
+ self.widgetLoads.removeAll();
+ $.each( self.displayedBoard().widgets, function( i,
widget ) {
+ widget.dataLoading = ko.observable( false );
+ self.widgetLoads.push( widget.dataLoading );
+ } );
+ }
+ setWidgetLoads();
+ self.displayedBoard.subscribe( setWidgetLoads );
//This will return true if any child widget is loading
self.dataLoading = ko.computed( function() {
-var i, widgetCount = self.widgetLoads.length;
+var i,
+ loads = self.widgetLoads(),
+ widgetCount = loads.length;
+
for ( i = 0; i widgetCount; i++ ) {
-if ( self.widgetLoads[i]() === true ) {
+if ( loads[i]() === true ) {
$('#loadingModal').modal('show'); //todo: knockout-style!
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/198265
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I838ddff5dd48ebc3be1f8d7cb12704e7fa792a5d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] JP Morgan: don't allow empty rows; update filename detection - change (wikimedia...crm)
Ejegg has submitted this change and it was merged.
Change subject: JP Morgan: don't allow empty rows; update filename detection
..
JP Morgan: don't allow empty rows; update filename detection
Change-Id: I5400d27050b58a016ba447fe8025ed93d97768d2
---
M sites/all/modules/offline2civicrm/JpMorganFile.php
M sites/all/modules/offline2civicrm/upload_form.js
2 files changed, 2 insertions(+), 10 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/offline2civicrm/JpMorganFile.php
b/sites/all/modules/offline2civicrm/JpMorganFile.php
index 84f97f3..c1802dd 100644
--- a/sites/all/modules/offline2civicrm/JpMorganFile.php
+++ b/sites/all/modules/offline2civicrm/JpMorganFile.php
@@ -55,21 +55,13 @@
);
}
-protected function parseRow( $data ) {
-// Empty rows are acceptable for this file
-if ( empty( $data['ACCOUNT NAME'] ) and empty( $data['REFERENCE'] ) ) {
-throw new EmptyRowException();
-}
-
-return parent::parseRow( $data );
-}
-
protected function mungeMessage( $msg ) {
// Approximate value in USD
$msg['gross'] = exchange_rate_convert(
$msg['original_currency'], $msg['original_gross'],
$msg['settlement_date']
);
+// TODO: We can remove this once MG uses smart groups instead of this
label.
// Flag as big-time if over $1000
if ( $msg['gross'] 1000 ) {
$msg['gift_source'] = 'Benefactor Gift';
diff --git a/sites/all/modules/offline2civicrm/upload_form.js
b/sites/all/modules/offline2civicrm/upload_form.js
index ead0b43..166e6b4 100644
--- a/sites/all/modules/offline2civicrm/upload_form.js
+++ b/sites/all/modules/offline2civicrm/upload_form.js
@@ -13,7 +13,7 @@
if ( /Coinbase|Orders-Report|\(Orders\)/.test( uploadFile ) ) {
fileType = coinbase;
-} else if ( /JPMorgan/.test( uploadFile ) ) {
+} else if ( /JPM/.test( uploadFile ) ) {
fileType = jpmorgan;
} else if ( /Paypal/.test( uploadFile ) ) {
fileType = paypal;
--
To view, visit https://gerrit.wikimedia.org/r/198085
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5400d27050b58a016ba447fe8025ed93d97768d2
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Katie Horn kh...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove widgets from boards - change (wikimedia...dash)
Ejegg has submitted this change and it was merged.
Change subject: Remove widgets from boards
..
Remove widgets from boards
WIP need to add to the others tomorrow
Change-Id: I81fa1551af5fbbd36361c22e0172d353c2d0e4ca
---
M src/bower_modules
M src/components/app-content/app-content.js
M src/components/widgets/x-by-y/x-by-y.html
3 files changed, 29 insertions(+), 0 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/src/bower_modules b/src/bower_modules
index 1323394..b570271 16
--- a/src/bower_modules
+++ b/src/bower_modules
-Subproject commit 132339455dc0bf26fe7599f2bb57c70800f92b9f
+Subproject commit b57027165c9375498978d3f65b8324d95621351c
diff --git a/src/components/app-content/app-content.js
b/src/components/app-content/app-content.js
index 2624c2c..db61aed 100644
--- a/src/components/app-content/app-content.js
+++ b/src/components/app-content/app-content.js
@@ -72,6 +72,20 @@
};
+self.removeWidgetFromBoard = function( event, data ){
+var removingBoard = self.displayedBoard().id;
+$.ajax({
+method: 'DELETE',
+url: '/board/' + removingBoard + '/widgets/' +
event.instanceID,
+success: function( ) {
+$.get( 'board/' + removingBoard, function( moredata ){
+console.log(moredata);
+self.displayedBoard( moredata );
+});
+}
+});
+};
+
self.setDisplayPage = function( e, data ){
var pages = [ 'Library', 'Profile', 'Home' ], view =
data.target.id;
diff --git a/src/components/widgets/x-by-y/x-by-y.html
b/src/components/widgets/x-by-y/x-by-y.html
index a65b3df..2af5887 100644
--- a/src/components/widgets/x-by-y/x-by-y.html
+++ b/src/components/widgets/x-by-y/x-by-y.html
@@ -15,6 +15,7 @@
ul class=dropdown-menu role=menu
aria-labelledby=savedCharts id=savedChartsMenu data-bind=foreach:
presetTitles, style: { width: '300px'}
li data-bind=text: $data/li
/ul --
+ button type=button class=btn btn-default
dropdown-toggle data-toggle=modal data-target=#removeModali class=fa
fa-times/i/button
/div
/div
@@ -159,3 +160,17 @@
/div!-- /.modal-content --
/div
/div
+
+div class=modal fade id=removeModal
+ div class=modal-dialog modal-sm
+ div class=modal-content
+ div class=modal-header
+ h2Remove this widget from the board?/h2
+ /div
+ div class=modal-body
+ button class=btn btn-lg btn-success
pull-right data-dismiss=modal data-bind=click:
$parents[2].removeWidgetFromBoard OK/button
+ button class=btn btn-lg btn-danger
pull-right data-dismiss=modal Cancel/button
+ /div
+ /div!-- /.modal-content --
+ /div
+/div
--
To view, visit https://gerrit.wikimedia.org/r/198255
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I81fa1551af5fbbd36361c22e0172d353c2d0e4ca
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add knockout-bootstrap and update dependencies - change (wikimedia...bower_modules)
Ejegg has submitted this change and it was merged. Change subject: Add knockout-bootstrap and update dependencies .. Add knockout-bootstrap and update dependencies Hope this version of bootstrap doesn't break stuff! Change-Id: I05366ac604086f30446c6193ff8fc7478f3248fc --- M bootstrap/.bower.json M bootstrap/Gruntfile.js M bootstrap/LICENSE M bootstrap/README.md M bootstrap/bower.json M bootstrap/dist/css/bootstrap-theme.css M bootstrap/dist/css/bootstrap-theme.css.map M bootstrap/dist/css/bootstrap-theme.min.css M bootstrap/dist/css/bootstrap.css M bootstrap/dist/css/bootstrap.css.map M bootstrap/dist/css/bootstrap.min.css M bootstrap/dist/fonts/glyphicons-halflings-regular.eot M bootstrap/dist/fonts/glyphicons-halflings-regular.svg M bootstrap/dist/fonts/glyphicons-halflings-regular.ttf M bootstrap/dist/fonts/glyphicons-halflings-regular.woff A bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 M bootstrap/dist/js/bootstrap.js M bootstrap/dist/js/bootstrap.min.js A bootstrap/dist/js/npm.js M bootstrap/fonts/glyphicons-halflings-regular.eot M bootstrap/fonts/glyphicons-halflings-regular.svg M bootstrap/fonts/glyphicons-halflings-regular.ttf M bootstrap/fonts/glyphicons-halflings-regular.woff A bootstrap/fonts/glyphicons-halflings-regular.woff2 A bootstrap/grunt/.jshintrc A bootstrap/grunt/bs-commonjs-generator.js M bootstrap/grunt/bs-glyphicons-data-generator.js M bootstrap/grunt/bs-lessdoc-parser.js A bootstrap/grunt/configBridge.json M bootstrap/grunt/sauce_browsers.yml A bootstrap/js/.jscsrc A bootstrap/js/.jshintrc M bootstrap/js/affix.js M bootstrap/js/alert.js M bootstrap/js/button.js M bootstrap/js/carousel.js M bootstrap/js/collapse.js M bootstrap/js/dropdown.js M bootstrap/js/modal.js M bootstrap/js/popover.js M bootstrap/js/scrollspy.js M bootstrap/js/tab.js M bootstrap/js/tooltip.js M bootstrap/js/transition.js A bootstrap/less/.csscomb.json A bootstrap/less/.csslintrc M bootstrap/less/alerts.less M bootstrap/less/badges.less M bootstrap/less/button-groups.less M bootstrap/less/buttons.less M bootstrap/less/carousel.less M bootstrap/less/close.less M bootstrap/less/code.less M bootstrap/less/component-animations.less M bootstrap/less/dropdowns.less M bootstrap/less/forms.less M bootstrap/less/glyphicons.less M bootstrap/less/jumbotron.less M bootstrap/less/list-group.less M bootstrap/less/media.less M bootstrap/less/mixins/buttons.less M bootstrap/less/mixins/forms.less M bootstrap/less/mixins/grid-framework.less M bootstrap/less/mixins/image.less M bootstrap/less/mixins/labels.less M bootstrap/less/mixins/vendor-prefixes.less M bootstrap/less/modals.less M bootstrap/less/navbar.less M bootstrap/less/navs.less M bootstrap/less/normalize.less M bootstrap/less/pager.less M bootstrap/less/pagination.less M bootstrap/less/panels.less M bootstrap/less/popovers.less M bootstrap/less/print.less M bootstrap/less/progress-bars.less M bootstrap/less/responsive-embed.less M bootstrap/less/scaffolding.less M bootstrap/less/tables.less M bootstrap/less/theme.less M bootstrap/less/thumbnails.less M bootstrap/less/tooltip.less M bootstrap/less/type.less M bootstrap/less/utilities.less M bootstrap/less/variables.less A bootstrap/package.js M bootstrap/package.json A knockout-bootstrap/.bower.json A knockout-bootstrap/Gruntfile.js A knockout-bootstrap/README.md A knockout-bootstrap/banner.txt A knockout-bootstrap/bower.json A knockout-bootstrap/build/knockout-bootstrap.min.js A knockout-bootstrap/examples/css/bootstrap.css A knockout-bootstrap/examples/css/bootstrap.css.map A knockout-bootstrap/examples/css/bootstrap.min.css A knockout-bootstrap/examples/css/docs.css A knockout-bootstrap/examples/css/prettify.css A knockout-bootstrap/examples/fonts/glyphicons-halflings-regular.eot A knockout-bootstrap/examples/fonts/glyphicons-halflings-regular.svg A knockout-bootstrap/examples/fonts/glyphicons-halflings-regular.ttf A knockout-bootstrap/examples/fonts/glyphicons-halflings-regular.woff A knockout-bootstrap/examples/img/bs-docs-masthead-pattern.png A knockout-bootstrap/examples/img/glyphicons-halflings-white.png A knockout-bootstrap/examples/img/glyphicons-halflings.png A knockout-bootstrap/examples/index.html A knockout-bootstrap/examples/js/bootstrap.js A knockout-bootstrap/examples/js/bootstrap.min.js A knockout-bootstrap/examples/js/knockout.js A knockout-bootstrap/examples/js/prettify.js A knockout-bootstrap/examples/js/typeahead.jquery.js A knockout-bootstrap/gulpfile.js A knockout-bootstrap/karma.conf.js A knockout-bootstrap/package.json A knockout-bootstrap/spec/test-spec.js A knockout-bootstrap/src/knockout-bootstrap.js A typeahead.js/.bower.json A typeahead.js/.gitignore A typeahead.js/.jshintrc A typeahead.js/.travis.yml A typeahead.js/CHANGELOG.md A typeahead.js/CONTRIBUTING.md A typeahead.js/Gruntfile.js A typeahead.js/LICENSE A typeahead.js/README.md A typeahead.js/bower.json A typeahead.js/composer.json A
[MediaWiki-commits] [Gerrit] Add knockout-bootstrap and update dependencies - change (wikimedia...bower_modules)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/198291 Change subject: Add knockout-bootstrap and update dependencies .. Add knockout-bootstrap and update dependencies Hope this version of bootstrap doesn't break stuff! Change-Id: I05366ac604086f30446c6193ff8fc7478f3248fc --- M bootstrap/.bower.json M bootstrap/Gruntfile.js M bootstrap/LICENSE M bootstrap/README.md M bootstrap/bower.json M bootstrap/dist/css/bootstrap-theme.css M bootstrap/dist/css/bootstrap-theme.css.map M bootstrap/dist/css/bootstrap-theme.min.css M bootstrap/dist/css/bootstrap.css M bootstrap/dist/css/bootstrap.css.map M bootstrap/dist/css/bootstrap.min.css M bootstrap/dist/fonts/glyphicons-halflings-regular.eot M bootstrap/dist/fonts/glyphicons-halflings-regular.svg M bootstrap/dist/fonts/glyphicons-halflings-regular.ttf M bootstrap/dist/fonts/glyphicons-halflings-regular.woff A bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 M bootstrap/dist/js/bootstrap.js M bootstrap/dist/js/bootstrap.min.js A bootstrap/dist/js/npm.js M bootstrap/fonts/glyphicons-halflings-regular.eot M bootstrap/fonts/glyphicons-halflings-regular.svg M bootstrap/fonts/glyphicons-halflings-regular.ttf M bootstrap/fonts/glyphicons-halflings-regular.woff A bootstrap/fonts/glyphicons-halflings-regular.woff2 A bootstrap/grunt/.jshintrc A bootstrap/grunt/bs-commonjs-generator.js M bootstrap/grunt/bs-glyphicons-data-generator.js M bootstrap/grunt/bs-lessdoc-parser.js A bootstrap/grunt/configBridge.json M bootstrap/grunt/sauce_browsers.yml A bootstrap/js/.jscsrc A bootstrap/js/.jshintrc M bootstrap/js/affix.js M bootstrap/js/alert.js M bootstrap/js/button.js M bootstrap/js/carousel.js M bootstrap/js/collapse.js M bootstrap/js/dropdown.js M bootstrap/js/modal.js M bootstrap/js/popover.js M bootstrap/js/scrollspy.js M bootstrap/js/tab.js M bootstrap/js/tooltip.js M bootstrap/js/transition.js A bootstrap/less/.csscomb.json A bootstrap/less/.csslintrc M bootstrap/less/alerts.less M bootstrap/less/badges.less M bootstrap/less/button-groups.less M bootstrap/less/buttons.less M bootstrap/less/carousel.less M bootstrap/less/close.less M bootstrap/less/code.less M bootstrap/less/component-animations.less M bootstrap/less/dropdowns.less M bootstrap/less/forms.less M bootstrap/less/glyphicons.less M bootstrap/less/jumbotron.less M bootstrap/less/list-group.less M bootstrap/less/media.less M bootstrap/less/mixins/buttons.less M bootstrap/less/mixins/forms.less M bootstrap/less/mixins/grid-framework.less M bootstrap/less/mixins/image.less M bootstrap/less/mixins/labels.less M bootstrap/less/mixins/vendor-prefixes.less M bootstrap/less/modals.less M bootstrap/less/navbar.less M bootstrap/less/navs.less M bootstrap/less/normalize.less M bootstrap/less/pager.less M bootstrap/less/pagination.less M bootstrap/less/panels.less M bootstrap/less/popovers.less M bootstrap/less/print.less M bootstrap/less/progress-bars.less M bootstrap/less/responsive-embed.less M bootstrap/less/scaffolding.less M bootstrap/less/tables.less M bootstrap/less/theme.less M bootstrap/less/thumbnails.less M bootstrap/less/tooltip.less M bootstrap/less/type.less M bootstrap/less/utilities.less M bootstrap/less/variables.less A bootstrap/package.js M bootstrap/package.json A knockout-bootstrap/.bower.json A knockout-bootstrap/Gruntfile.js A knockout-bootstrap/README.md A knockout-bootstrap/banner.txt A knockout-bootstrap/bower.json A knockout-bootstrap/build/knockout-bootstrap.min.js A knockout-bootstrap/examples/css/bootstrap.css A knockout-bootstrap/examples/css/bootstrap.css.map A knockout-bootstrap/examples/css/bootstrap.min.css A knockout-bootstrap/examples/css/docs.css A knockout-bootstrap/examples/css/prettify.css A knockout-bootstrap/examples/fonts/glyphicons-halflings-regular.eot A knockout-bootstrap/examples/fonts/glyphicons-halflings-regular.svg A knockout-bootstrap/examples/fonts/glyphicons-halflings-regular.ttf A knockout-bootstrap/examples/fonts/glyphicons-halflings-regular.woff A knockout-bootstrap/examples/img/bs-docs-masthead-pattern.png A knockout-bootstrap/examples/img/glyphicons-halflings-white.png A knockout-bootstrap/examples/img/glyphicons-halflings.png A knockout-bootstrap/examples/index.html A knockout-bootstrap/examples/js/bootstrap.js A knockout-bootstrap/examples/js/bootstrap.min.js A knockout-bootstrap/examples/js/knockout.js A knockout-bootstrap/examples/js/prettify.js A knockout-bootstrap/examples/js/typeahead.jquery.js A knockout-bootstrap/gulpfile.js A knockout-bootstrap/karma.conf.js A knockout-bootstrap/package.json A knockout-bootstrap/spec/test-spec.js A knockout-bootstrap/src/knockout-bootstrap.js A typeahead.js/.bower.json A typeahead.js/.gitignore A typeahead.js/.jshintrc A typeahead.js/.travis.yml A typeahead.js/CHANGELOG.md A typeahead.js/CONTRIBUTING.md A typeahead.js/Gruntfile.js A typeahead.js/LICENSE A typeahead.js/README.md A typeahead.js/bower.json A
[MediaWiki-commits] [Gerrit] Add knockout-bootstrap and update dependencies - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/198294
Change subject: Add knockout-bootstrap and update dependencies
..
Add knockout-bootstrap and update dependencies
Change-Id: I37f519e04a997b01bda3df11c66b30d015651af0
---
M bower.json
M src/bower_modules
2 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/94/198294/1
diff --git a/bower.json b/bower.json
index 75802c6..ad17a91 100644
--- a/bower.json
+++ b/bower.json
@@ -41,7 +41,8 @@
jquery: ~2.1.1,
nouislider: ~7.0.7,
numeraljs: ~1.5.3,
-select2: ~3.5.2
+select2: ~3.5.2,
+knockout-bootstrap: ~0.3.2
},
keywords: [
dash
@@ -49,7 +50,7 @@
homepage: http://sherah.github.io/dash;,
private: true,
resolutions: {
-bootstrap: =3.0 4.0,
+bootstrap: 3.3.4,
jquery: 2.1.1
}
}
diff --git a/src/bower_modules b/src/bower_modules
index b570271..e554ed2 16
--- a/src/bower_modules
+++ b/src/bower_modules
-Subproject commit b57027165c9375498978d3f65b8324d95621351c
+Subproject commit e554ed28cca9d593a3edf293103f3ad4ca724719
--
To view, visit https://gerrit.wikimedia.org/r/198294
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I37f519e04a997b01bda3df11c66b30d015651af0
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't try to bind to an undefined board - change (wikimedia...dash)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/198399 Change subject: Don't try to bind to an undefined board .. Don't try to bind to an undefined board Stops js errors in minified version Change-Id: Ifa13483f5b2e7d88da68d3a22a93ed0b64cbea11 --- M src/components/app-content/app-content.html 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/99/198399/1 diff --git a/src/components/app-content/app-content.html b/src/components/app-content/app-content.html index 5dd94f8..caa32de 100644 --- a/src/components/app-content/app-content.html +++ b/src/components/app-content/app-content.html @@ -5,7 +5,7 @@ section id=appContent data-bind=if: displayPage() === 'Home' div class=container-fluid data-bind='if: loggedIn' - div class=row + div class=row data-bind='if:displayedBoard' generic-board params=displayedBoard: displayedBoard/generic-board /div /div -- To view, visit https://gerrit.wikimedia.org/r/198399 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifa13483f5b2e7d88da68d3a22a93ed0b64cbea11 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: master Gerrit-Owner: Ejegg eeggles...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove buttons for all widgets - change (wikimedia...dash)
Ejegg has submitted this change and it was merged.
Change subject: Remove buttons for all widgets
..
Remove buttons for all widgets
Fixed to have unique modal id's
There is an issue with the modal backdrop so that is handled in the
reloading of the board until we figure out what to do about modals.
There is another issue with the fact that reloading the board triggers
the loading modal for x by y momentarily, which is ugly and bad.
Change-Id: I2087180c803b6934f7add6e2d2e5b0a3d3cf6a86
---
M src/components/app-content/app-content.js
M src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
M src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.html
M src/components/widgets/fraud-gauge/fraud-gauge.html
M src/components/widgets/totals-earned-chart/totals-earned-chart.html
M src/components/widgets/x-by-y/x-by-y.html
6 files changed, 69 insertions(+), 5 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/src/components/app-content/app-content.js
b/src/components/app-content/app-content.js
index db61aed..36b52d3 100644
--- a/src/components/app-content/app-content.js
+++ b/src/components/app-content/app-content.js
@@ -74,13 +74,14 @@
self.removeWidgetFromBoard = function( event, data ){
var removingBoard = self.displayedBoard().id;
+console.log('data: ', data);
$.ajax({
method: 'DELETE',
url: '/board/' + removingBoard + '/widgets/' +
event.instanceID,
success: function( ) {
$.get( 'board/' + removingBoard, function( moredata ){
-console.log(moredata);
self.displayedBoard( moredata );
+$('.modal-backdrop').remove();
});
}
});
diff --git
a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
index 56091db..be07c74 100644
--- a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
+++ b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
@@ -1,7 +1,10 @@
div class=col-md-6 lastWidget
div class=panel panel-purple
div class=panel-heading
- p data-bind=text:title/p
+ p class=pull-left data-bind=text:title/p
+ div class=btn-group btn-group-xs pull-right
+ button type=button class=btn btn-sm
btn-default dropdown-toggle data-toggle=modal data-bind=attr: {
'data-target': '#remove'+instanceID }i class=fa fa-times/i/button
+ /div
/div
div class=panel-body
p data-bind=visible: !hasData()No data available.
This widget requires a widget like Totals Earned to provide data./p
@@ -10,4 +13,18 @@
/div
/div
/div
+/div
+
+div class=modal fade data-bind=attr: { id: 'remove'+instanceID }
+ div class=modal-dialog modal-sm
+ div class=modal-content
+ div class=modal-header
+ h2Remove this widget from the board?/h2
+ /div
+ div class=modal-body
+ button class=btn btn-lg btn-success
pull-right data-dismiss=modal data-bind=click:
$parents[2].removeWidgetFromBoard OK/button
+ button class=btn btn-lg btn-danger
pull-right data-dismiss=modal Cancel/button
+ /div
+ /div!-- /.modal-content --
+ /div
/div
\ No newline at end of file
diff --git
a/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.html
b/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.html
index b74b42f..950b808 100644
--- a/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.html
+++ b/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.html
@@ -1,7 +1,10 @@
div class=col-md-6 firstWidget
div class=panel panel-purple
div class=panel-heading
- p data-bind=text: title/p
+ p class=pull-left data-bind=text: title/p
+ div class=btn-group btn-group-xs pull-right
+ button type=button class=btn btn-sm
btn-default dropdown-toggle data-toggle=modal data-bind=attr: {
'data-target': '#remove'+instanceID }i class=fa fa-times/i/button
+ /div
/div
div class=panel-body
p data-bind=visible: !hasData()No data available.
This widget requires a widget like Totals Earned to provide data./p
@@ -12,4 +15,18 @@
/div
/div
/div
[MediaWiki-commits] [Gerrit] Move integration scripts into this repo - change (wikimedia...crm)
Ejegg has submitted this change and it was merged.
Change subject: Move integration scripts into this repo
..
Move integration scripts into this repo
Since these are not reused by any other CI jobs, it makes sense to house
them here.
Bug: T78100
Change-Id: I7ee1e73b9f86535fc7227eff44223658676133a8
---
A bin/ci-create-dbs.sh
A bin/ci-drop-dbs.sh
A bin/ci-populate-dbs.sh
A bin/ci-settings.sh
4 files changed, 74 insertions(+), 0 deletions(-)
Approvals:
Ejegg: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/ci-create-dbs.sh b/bin/ci-create-dbs.sh
new file mode 100755
index 000..0f6555e
--- /dev/null
+++ b/bin/ci-create-dbs.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+BASEDIR=$(dirname $0)
+. $BASEDIR/ci-settings.sh
+
+echo Creating databases with the prefix '${CIVICRM_SCHEMA_PREFIX}'
+
+for i in 1 2 3; do
+ mysql -u root EOS
+ drop database if exists ${CIVICRM_SCHEMA_PREFIX}${i};
+ create database ${CIVICRM_SCHEMA_PREFIX}${i};
+ grant all on ${CIVICRM_SCHEMA_PREFIX}${i}.* to
'${CIVICRM_MYSQL_USERNAME}'@'${BUILD_HOST}' identified by
'${CIVICRM_MYSQL_PASSWORD}';
+EOS
+done
diff --git a/bin/ci-drop-dbs.sh b/bin/ci-drop-dbs.sh
new file mode 100755
index 000..be72fb7
--- /dev/null
+++ b/bin/ci-drop-dbs.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+BASEDIR=$(dirname $0)
+. $BASEDIR/ci-settings.sh
+
+echo Dropping databases with the prefix '${CIVICRM_SCHEMA_PREFIX}'
+
+for i in 1 2 3; do
+ mysql -u root EOS
+ drop database if exists ${CIVICRM_SCHEMA_PREFIX}${i};
+EOS
+done
+
+mysql -u root EOS
+REVOKE ALL PRIVILEGES, GRANT OPTION FROM
'${CIVICRM_MYSQL_USERNAME}'@'${BUILD_HOST}';
+DROP USER '${CIVICRM_MYSQL_USERNAME}'@'${BUILD_HOST}';
+EOS
diff --git a/bin/ci-populate-dbs.sh b/bin/ci-populate-dbs.sh
new file mode 100755
index 000..07b4674
--- /dev/null
+++ b/bin/ci-populate-dbs.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+BASEDIR=$(dirname $0)
+. $BASEDIR/ci-settings.sh
+
+echo Populating databases with the prefix '${CIVICRM_SCHEMA_PREFIX}'
+
+export
PRECREATED_DSN_PATTERN=mysql://${CIVICRM_MYSQL_USERNAME}:${CIVICRM_MYSQL_PASSWORD}@${BUILD_HOST}/${CIVICRM_SCHEMA_PREFIX}{{db_seq}}
+
+#FIXME: --web-root=$WORKSPACE/src/crm
+
+$WORKSPACE/src/wikimedia/fundraising/civicrm-buildkit/bin/amp config:set \
+ --mysql_type=precreated \
+ --httpd_type=none \
+ --perm_type=none
+
+rm -rf $WORKSPACE/src/wikimedia/fundraising/civicrm-buildkit/build/wmff
+mkdir -p $WORKSPACE/src/wikimedia/fundraising/civicrm-buildkit/build
+ln -s $WORKSPACE/src/wikimedia/fundraising/crm
$WORKSPACE/src/wikimedia/fundraising/civicrm-buildkit/build/wmff
+
+$WORKSPACE/src/wikimedia/fundraising/civicrm-buildkit/bin/civibuild reinstall
wmff
diff --git a/bin/ci-settings.sh b/bin/ci-settings.sh
new file mode 100644
index 000..3c48bd2
--- /dev/null
+++ b/bin/ci-settings.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+if [ x${JOB_NAME} = x ]; then
+ echo JOB_NAME environment variable was not set, exiting.
+ exit 1
+fi
+if [ x${BUILD_NUMBER} = x ]; then
+ echo BUILD_NUMBER environment variable was not set, exiting.
+ exit 1
+fi
+
+# MYSQL database name cant use spaces or dashes:
+JOB_ID=${JOB_NAME// /_}_${BUILD_NUMBER}
+JOB_ID=${JOB_ID//-/_}
+
+CIVICRM_SCHEMA_PREFIX=civicrm_${JOB_ID}_
+
+BUILD_HOST=`hostname`
+# MySQL username is limited to 16 chars, use build number as an identifier:
+CIVICRM_MYSQL_USERNAME=civitest_${BUILD_NUMBER}
+
+CIVICRM_MYSQL_PASSWORD=pw_${JOB_ID}
--
To view, visit https://gerrit.wikimedia.org/r/194915
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ee1e73b9f86535fc7227eff44223658676133a8
Gerrit-PatchSet: 6
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Katie Horn kh...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Let composer install the stuff - change (wikimedia...civicrm-buildkit)
Ejegg has submitted this change and it was merged.
Change subject: Let composer install the stuff
..
Let composer install the stuff
Bug: T86374
Change-Id: I1ab4b162e6882af1b817a53922392555a70a8f14
---
M composer.json
M composer.lock
D vendor
3 files changed, 23 insertions(+), 17 deletions(-)
Approvals:
Ejegg: Verified; Looks good to me, approved
diff --git a/composer.json b/composer.json
index 1bafd44..157b985 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
php: =5.3.3,
drush/drush: dev-master#d1d13676f5beacaa9f8619088fe3ae45ea28a6cf,
wp-cli/wp-cli: 0.17,
-totten/amp: dev-master#8dc281d654514c7bd27f115ceb294b30603671fb,
+totten/amp: dev-master,
totten/git-scan: dev-master#495f9ee8db337b3903929a6bf713f6b427e99d8e,
civicrm/upgrade-test: 0.3,
brianium/paratest: dev-batching as 0.7,
@@ -25,6 +25,10 @@
repositories: [
{
type: git,
+ url:
https://gerrit.wikimedia.org/r/wikimedia/fundraising/civicrm-buildkit/vendor/totten/amp;
+},
+{
+ type: git,
url: https://github.com/totten/paratest.git;
},
{
diff --git a/composer.lock b/composer.lock
index 748337e..9110393 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
Read more about it at
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
This file is @generated automatically
],
-hash: d96ce7367f4aef70ab743dcac6e29be7,
+hash: 1fb4b8052924c9ffdc7653b5d0bbd4f6,
packages: [
{
name: brianium/habitat,
@@ -98,7 +98,7 @@
parallel,
testing
],
-time: 2014-09-21 03:48:50
+time: 2014-09-21 04:45:25
},
{
name: civicrm/upgrade-test,
@@ -137,12 +137,12 @@
version: v1.0.8,
source: {
type: git,
-url: https://github.com/d11wtq/boris.git;,
+url: https://github.com/borisrepl/boris.git;,
reference: 125dd4e5752639af7678a22ea597115646d89c6e
},
dist: {
type: zip,
-url:
https://api.github.com/repos/d11wtq/boris/zipball/125dd4e5752639af7678a22ea597115646d89c6e;,
+url:
https://api.github.com/repos/borisrepl/boris/zipball/125dd4e5752639af7678a22ea597115646d89c6e;,
reference: 125dd4e5752639af7678a22ea597115646d89c6e,
shasum:
},
@@ -176,7 +176,7 @@
},
dist: {
type: zip,
-url:
https://api.github.com/repos/drush-ops/drush/zipball/716e06cfe40a637155829213b0943f96d73fd62f;,
+url:
https://api.github.com/repos/drush-ops/drush/zipball/7739c9bad10c1f2ec7e9534549bf022248a1ad1b;,
reference: d1d13676f5beacaa9f8619088fe3ae45ea28a6cf,
shasum:
},
@@ -198,6 +198,11 @@
drush.complete.sh
],
type: library,
+extra: {
+branch-alias: {
+dev-master: 7.0.x-dev
+}
+},
autoload: {
psr-0: {
Drush: lib/
@@ -235,11 +240,15 @@
{
name: Jonathan Hedstrom,
email: jhedst...@gmail.com
+},
+{
+name: Christopher Gervais,
+email: ch...@ergonlogic.com
}
],
description: Drush is a command line shell and scripting
interface for Drupal, a veritable Swiss Army knife designed to make life easier
for those of us who spend some of our working hours hacking away at the command
prompt.,
homepage: http://www.drush.org;,
-time: 2014-12-10 21:58:35
+time: 2013-10-26 07:40:45
},
{
name: joomlatools/joomla-console,
@@ -1445,14 +1454,8 @@
version: dev-master,
source: {
type: git,
-url: https://github.com/totten/amp.git;,
-reference: 8dc281d654514c7bd27f115ceb294b30603671fb
-},
-dist: {
-type: zip,
-url:
https://api.github.com/repos/totten/amp/zipball/8dc281d654514c7bd27f115ceb294b30603671fb;,
-reference: 8dc281d654514c7bd27f115ceb294b30603671fb,
-shasum:
+url:
https://gerrit.wikimedia.org/r/wikimedia/fundraising/civicrm-buildkit/vendor/totten/amp;,
+reference: 12fc702ee8d3d074f2a313541427a9f6260cfa34
},
require: {
php: =5.3.3,
@@ -1474,7 +1477,6 @@
DB\\: src/
}
},
-notification-url: https://packagist.org/downloads/;,
[MediaWiki-commits] [Gerrit] Remove .gitmodules - change (wikimedia...civicrm-buildkit)
Ejegg has submitted this change and it was merged. Change subject: Remove .gitmodules .. Remove .gitmodules Bug: T86374 Change-Id: I57e779ebfe4dc0b9e2977251c656998b482f0971 --- D .gitmodules 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Ejegg: Verified; Looks good to me, approved diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index d83a5f0..000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule vendor] - path = vendor - url = https://gerrit.wikimedia.org/r/wikimedia/fundraising/civicrm-buildkit/vendor -- To view, visit https://gerrit.wikimedia.org/r/194989 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I57e779ebfe4dc0b9e2977251c656998b482f0971 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/civicrm-buildkit Gerrit-Branch: master Gerrit-Owner: Awight awi...@wikimedia.org Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com Gerrit-Reviewer: Awight awi...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Katie Horn kh...@wikimedia.org Gerrit-Reviewer: Ssmith ssm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] composer package updates - change (wikimedia...civicrm-buildkit)
Ejegg has submitted this change and it was merged.
Change subject: composer package updates
..
composer package updates
Change-Id: I12acb3a2aa2ad13786fcf5ce8eda95ba2360e40d
---
M composer.lock
M vendor
2 files changed, 97 insertions(+), 40 deletions(-)
Approvals:
Ejegg: Verified; Looks good to me, approved
diff --git a/composer.lock b/composer.lock
index 4d4a0e9..748337e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -98,7 +98,7 @@
parallel,
testing
],
-time: 2014-09-21 04:45:25
+time: 2014-09-21 03:48:50
},
{
name: civicrm/upgrade-test,
@@ -181,9 +181,10 @@
shasum:
},
require: {
-d11wtq/boris: *,
+d11wtq/boris: ~1.0,
pear/console_table: ~1.2.0,
php: =5.3.0,
+symfony/var-dumper: 2.6.3,
symfony/yaml: ~2.2
},
require-dev: {
@@ -238,7 +239,7 @@
],
description: Drush is a command line shell and scripting
interface for Drupal, a veritable Swiss Army knife designed to make life easier
for those of us who spend some of our working hours hacking away at the command
prompt.,
homepage: http://www.drush.org;,
-time: 2013-10-26 07:40:45
+time: 2014-12-10 21:58:35
},
{
name: joomlatools/joomla-console,
@@ -986,17 +987,17 @@
},
{
name: symfony/config,
-version: v2.6.1,
+version: v2.6.4,
target-dir: Symfony/Component/Config,
source: {
type: git,
url: https://github.com/symfony/Config.git;,
-reference: 84c0c150c1520995f09ea9e47e817068b353cb0f
+reference: a9f781ba1221067d1f07c8cec0bc50f81b8d7408
},
dist: {
type: zip,
-url:
https://api.github.com/repos/symfony/Config/zipball/84c0c150c1520995f09ea9e47e817068b353cb0f;,
-reference: 84c0c150c1520995f09ea9e47e817068b353cb0f,
+url:
https://api.github.com/repos/symfony/Config/zipball/a9f781ba1221067d1f07c8cec0bc50f81b8d7408;,
+reference: a9f781ba1221067d1f07c8cec0bc50f81b8d7408,
shasum:
},
require: {
@@ -1030,7 +1031,7 @@
],
description: Symfony Config Component,
homepage: http://symfony.com;,
-time: 2014-12-02 20:19:20
+time: 2015-01-21 20:57:55
},
{
name: symfony/console,
@@ -1087,26 +1088,29 @@
},
{
name: symfony/dependency-injection,
-version: v2.6.1,
+version: v2.6.4,
target-dir: Symfony/Component/DependencyInjection,
source: {
type: git,
url: https://github.com/symfony/DependencyInjection.git;,
-reference: e2693382ef9456a7c7e382f34f813e4b4332941d
+reference: 42bbb43fab66292a1865dc9616c299904c3d4d14
},
dist: {
type: zip,
-url:
https://api.github.com/repos/symfony/DependencyInjection/zipball/e2693382ef9456a7c7e382f34f813e4b4332941d;,
-reference: e2693382ef9456a7c7e382f34f813e4b4332941d,
+url:
https://api.github.com/repos/symfony/DependencyInjection/zipball/42bbb43fab66292a1865dc9616c299904c3d4d14;,
+reference: 42bbb43fab66292a1865dc9616c299904c3d4d14,
shasum:
},
require: {
php: =5.3.3
},
+conflict: {
+symfony/expression-language: 2.6
+},
require-dev: {
symfony/config: ~2.2,
-symfony/expression-language: ~2.4,
-symfony/yaml: ~2.0
+symfony/expression-language: ~2.6,
+symfony/yaml: ~2.1
},
suggest: {
symfony/config: ,
@@ -1140,21 +1144,21 @@
],
description: Symfony DependencyInjection Component,
homepage: http://symfony.com;,
-time: 2014-12-03 09:22:11
+time: 2015-01-25 04:39:26
},
{
name: symfony/filesystem,
-version: v2.6.1,
+version: v2.6.4,
target-dir: Symfony/Component/Filesystem,
source: {
type: git,
url: https://github.com/symfony/Filesystem.git;,
-reference: ff6efc95256cb33031933729e68b01d720b5436b
+reference: a1f566d1f92e142fa1593f4555d6d89e3044a9b7
},
dist: {
type: zip,
-url:
[MediaWiki-commits] [Gerrit] pushd to less crazy directory before running drush - change (wikimedia...civicrm-buildkit)
Ejegg has submitted this change and it was merged.
Change subject: pushd to less crazy directory before running drush
..
pushd to less crazy directory before running drush
Setting the CWD to drupal/sites/default won't work in our case, cos
drupal/sites is a symlink. Just stay in the drupal dir.
Bug: T78100
Change-Id: Ib3105974b76f3d738319295b46dcb331dd9ae84e
---
M app/config/wmff/install.sh
1 file changed, 58 insertions(+), 60 deletions(-)
Approvals:
Ejegg: Verified; Looks good to me, approved
diff --git a/app/config/wmff/install.sh b/app/config/wmff/install.sh
index 5272932..0e1d29d 100644
--- a/app/config/wmff/install.sh
+++ b/app/config/wmff/install.sh
@@ -30,67 +30,65 @@
###
## Extra configuration
-pushd ${CMS_ROOT}/sites/${DRUPAL_SITE_DIR} /dev/null
+pushd $CMS_ROOT
+drush -y en \
+ civicrm \
+ toolbar \
+ garland \
+ contribution_audit \
+ contribution_tracking \
+ devel \
+ environment_indicator \
+ exchange_rates \
+ ganglia_reporter \
+ globalcollect_audit \
+ large_donation \
+ log_audit \
+ offline2civicrm \
+ paypal_audit \
+ queue2civicrm \
+ queue2civicrm_tests \
+ recurring \
+ recurring_globalcollect \
+ twigext_l10n_tests \
+ syslog \
+ thank_you \
+ wmf_audit \
+ wmf_campaigns \
+ wmf_civicrm \
+ wmf_common \
+ wmf_communication \
+ wmf_communication_tests \
+ wmf_contribution_search \
+ wmf_fredge_qc \
+ wmf_logging \
+ wmf_refund_qc \
+ wmf_reports \
+ wmf_test_settings \
+ wmf_unsubscribe \
+ wmf_unsubscribe_qc \
+ wmf_zendesk_reports \
+ worldpay_audit
- drush -y en \
-civicrm \
-toolbar \
-garland \
-contribution_audit \
-contribution_tracking \
-devel \
-environment_indicator \
-exchange_rates \
-ganglia_reporter \
-globalcollect_audit \
-large_donation \
-log_audit \
-offline2civicrm \
-paypal_audit \
-queue2civicrm \
-queue2civicrm_tests \
-recurring \
-recurring_globalcollect \
-twigext_l10n_tests \
-syslog \
-thank_you \
-wmf_audit \
-wmf_campaigns \
-wmf_civicrm \
-wmf_common \
-wmf_communication \
-wmf_communication_tests \
-wmf_contribution_search \
-wmf_fredge_qc \
-wmf_logging \
-wmf_refund_qc \
-wmf_reports \
-wmf_test_settings \
-wmf_unsubscribe \
-wmf_unsubscribe_qc \
-wmf_zendesk_reports \
-worldpay_audit
+drush -y updatedb
- drush -y updatedb
+## Setup theme
+#above# drush -y en garland
+export SITE_CONFIG_DIR
+drush -y -u $ADMIN_USER scr $SITE_CONFIG_DIR/install-theme.php
- ## Setup theme
- #above# drush -y en garland
- export SITE_CONFIG_DIR
- drush -y -u $ADMIN_USER scr $SITE_CONFIG_DIR/install-theme.php
+## Based on the block info, CRM_Core_Block::CREATE_NEW and CRM_Core_Block::ADD
should be enabled by default, but they aren't.
+## drush -y cc all and drush -y cc block do *NOT* solve the problem. But
this does:
+drush php-eval -u $ADMIN_USER
'module_load_include(inc,block,block.admin); block_admin_display();'
- ## Based on the block info, CRM_Core_Block::CREATE_NEW and
CRM_Core_Block::ADD should be enabled by default, but they aren't.
- ## drush -y cc all and drush -y cc block do *NOT* solve the problem. But
this does:
- drush php-eval -u $ADMIN_USER
'module_load_include(inc,block,block.admin); block_admin_display();'
-
- ## Setup demo user
- drush -y en civicrm_webtest
- drush -y user-create --password=$DEMO_PASS --mail=$DEMO_EMAIL
$DEMO_USER
- #drush -y user-add-role civicrm_webtest_user $DEMO_USER
- # In Garland, CiviCRM's toolbar looks messy unless you also activate
Drupal's toolbar, so grant access toolbar
- # We've activated more components than typical web-test baseline, so grant
rights to those components.
- #for perm in 'access toolbar'
- #do
- # drush -y role-add-perm civicrm_webtest_user $perm
- #done
-
-popd /dev/null
+## Setup demo user
+drush -y en civicrm_webtest
+drush -y user-create --password=$DEMO_PASS --mail=$DEMO_EMAIL $DEMO_USER
+#drush -y user-add-role civicrm_webtest_user $DEMO_USER
+# In Garland, CiviCRM's toolbar looks messy unless you also activate Drupal's
toolbar, so grant access toolbar
+# We've activated more components than typical web-test baseline, so grant
rights to those components.
+#for perm in 'access toolbar'
+#do
+# drush -y role-add-perm civicrm_webtest_user $perm
+#done
+popd
--
To view, visit https://gerrit.wikimedia.org/r/195010
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3105974b76f3d738319295b46dcb331dd9ae84e
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/civicrm-buildkit
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ejegg
[MediaWiki-commits] [Gerrit] Don't install SimpleTest modules - change (wikimedia...civicrm-buildkit)
Ejegg has submitted this change and it was merged. Change subject: Don't install SimpleTest modules .. Don't install SimpleTest modules Change-Id: Iac0407ff43f4836f3f4026fdfa95f16dbb8dde9c --- M app/config/wmff/install.sh 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Ejegg: Verified; Looks good to me, approved diff --git a/app/config/wmff/install.sh b/app/config/wmff/install.sh index 0e1d29d..64af4b7 100644 --- a/app/config/wmff/install.sh +++ b/app/config/wmff/install.sh @@ -47,10 +47,8 @@ offline2civicrm \ paypal_audit \ queue2civicrm \ - queue2civicrm_tests \ recurring \ recurring_globalcollect \ - twigext_l10n_tests \ syslog \ thank_you \ wmf_audit \ @@ -58,7 +56,6 @@ wmf_civicrm \ wmf_common \ wmf_communication \ - wmf_communication_tests \ wmf_contribution_search \ wmf_fredge_qc \ wmf_logging \ -- To view, visit https://gerrit.wikimedia.org/r/195054 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iac0407ff43f4836f3f4026fdfa95f16dbb8dde9c Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/civicrm-buildkit Gerrit-Branch: master Gerrit-Owner: Awight awi...@wikimedia.org Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com Gerrit-Reviewer: Awight awi...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Katie Horn kh...@wikimedia.org Gerrit-Reviewer: Ssmith ssm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Mock VCS revsion stamp - change (wikimedia...civicrm-buildkit)
Ejegg has submitted this change and it was merged. Change subject: Mock VCS revsion stamp .. Mock VCS revsion stamp This value is stored in source_revision of any inserted contributions. Change-Id: I2959247d3d7daf21d541911ec38b05ec385ccb13 --- M app/config/wmff/drupal.settings.d/50-wmff.php 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Ejegg: Verified; Looks good to me, approved diff --git a/app/config/wmff/drupal.settings.d/50-wmff.php b/app/config/wmff/drupal.settings.d/50-wmff.php index 848487b..5f45148 100644 --- a/app/config/wmff/drupal.settings.d/50-wmff.php +++ b/app/config/wmff/drupal.settings.d/50-wmff.php @@ -8,3 +8,5 @@ $databases['donations']['default'] = $databases['default']['default']; $databases['fredge']['default'] = $databases['default']['default']; + +define( 'WMF_SOURCE_REVISION', 'integration' ); -- To view, visit https://gerrit.wikimedia.org/r/195055 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2959247d3d7daf21d541911ec38b05ec385ccb13 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/civicrm-buildkit Gerrit-Branch: master Gerrit-Owner: Awight awi...@wikimedia.org Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com Gerrit-Reviewer: Awight awi...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Katie Horn kh...@wikimedia.org Gerrit-Reviewer: Ssmith ssm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Download stuff before running it. - change (wikimedia...crm)
Ejegg has submitted this change and it was merged. Change subject: Download stuff before running it. .. Download stuff before running it. Bug: T78100 Change-Id: I1c6a5546149886d54c3b7e188df4c659c517a5b1 --- M bin/ci-populate-dbs.sh 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Ejegg: Looks good to me, approved diff --git a/bin/ci-populate-dbs.sh b/bin/ci-populate-dbs.sh index 07b4674..316df56 100755 --- a/bin/ci-populate-dbs.sh +++ b/bin/ci-populate-dbs.sh @@ -9,6 +9,8 @@ #FIXME: --web-root=$WORKSPACE/src/crm +$WORKSPACE/src/wikimedia/fundraising/civicrm-buildkit/bin/civi-download-tools + $WORKSPACE/src/wikimedia/fundraising/civicrm-buildkit/bin/amp config:set \ --mysql_type=precreated \ --httpd_type=none \ -- To view, visit https://gerrit.wikimedia.org/r/194998 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1c6a5546149886d54c3b7e188df4c659c517a5b1 Gerrit-PatchSet: 3 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: Awight awi...@wikimedia.org Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com Gerrit-Reviewer: Awight awi...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Katie Horn kh...@wikimedia.org Gerrit-Reviewer: Ssmith ssm...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Ignore vendor - change (wikimedia...civicrm-buildkit)
Ejegg has submitted this change and it was merged. Change subject: Ignore vendor .. Ignore vendor Bug: T78100 Change-Id: I3dd88668cc8726d348206d76e6658ce4c2a7503d --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Ejegg: Verified; Looks good to me, approved diff --git a/.gitignore b/.gitignore index 4a6bb16..6091f01 100644 --- a/.gitignore +++ b/.gitignore @@ -30,4 +30,5 @@ build/ extern/ vagrant/*/.vagrant +vendor/ web/ -- To view, visit https://gerrit.wikimedia.org/r/195011 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3dd88668cc8726d348206d76e6658ce4c2a7503d Gerrit-PatchSet: 3 Gerrit-Project: wikimedia/fundraising/civicrm-buildkit Gerrit-Branch: master Gerrit-Owner: Awight awi...@wikimedia.org Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com Gerrit-Reviewer: Awight awi...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Katie Horn kh...@wikimedia.org Gerrit-Reviewer: Ssmith ssm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Correct mysql client machine name - change (wikimedia...crm)
Ejegg has submitted this change and it was merged.
Change subject: Correct mysql client machine name
..
Correct mysql client machine name
Bug: T86374
Change-Id: I4f326d1d931ae1de3b5356384cc8c7a90e59d5cf
---
M bin/ci-create-dbs.sh
M bin/ci-drop-dbs.sh
M bin/ci-populate-dbs.sh
M bin/ci-settings.sh
4 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/bin/ci-create-dbs.sh b/bin/ci-create-dbs.sh
index 0f6555e..924ee43 100755
--- a/bin/ci-create-dbs.sh
+++ b/bin/ci-create-dbs.sh
@@ -9,6 +9,6 @@
mysql -u root EOS
drop database if exists ${CIVICRM_SCHEMA_PREFIX}${i};
create database ${CIVICRM_SCHEMA_PREFIX}${i};
- grant all on ${CIVICRM_SCHEMA_PREFIX}${i}.* to
'${CIVICRM_MYSQL_USERNAME}'@'${BUILD_HOST}' identified by
'${CIVICRM_MYSQL_PASSWORD}';
+ grant all on ${CIVICRM_SCHEMA_PREFIX}${i}.* to
'${CIVICRM_MYSQL_USERNAME}'@'${CIVICRM_MYSQL_CLIENT}' identified by
'${CIVICRM_MYSQL_PASSWORD}';
EOS
done
diff --git a/bin/ci-drop-dbs.sh b/bin/ci-drop-dbs.sh
index be72fb7..ad1966b 100755
--- a/bin/ci-drop-dbs.sh
+++ b/bin/ci-drop-dbs.sh
@@ -12,6 +12,6 @@
done
mysql -u root EOS
-REVOKE ALL PRIVILEGES, GRANT OPTION FROM
'${CIVICRM_MYSQL_USERNAME}'@'${BUILD_HOST}';
-DROP USER '${CIVICRM_MYSQL_USERNAME}'@'${BUILD_HOST}';
+REVOKE ALL PRIVILEGES, GRANT OPTION FROM
'${CIVICRM_MYSQL_USERNAME}'@'${CIVICRM_MYSQL_CLIENT}';
+DROP USER '${CIVICRM_MYSQL_USERNAME}'@'${CIVICRM_MYSQL_CLIENT}';
EOS
diff --git a/bin/ci-populate-dbs.sh b/bin/ci-populate-dbs.sh
index 316df56..22f36d6 100755
--- a/bin/ci-populate-dbs.sh
+++ b/bin/ci-populate-dbs.sh
@@ -5,7 +5,7 @@
echo Populating databases with the prefix '${CIVICRM_SCHEMA_PREFIX}'
-export
PRECREATED_DSN_PATTERN=mysql://${CIVICRM_MYSQL_USERNAME}:${CIVICRM_MYSQL_PASSWORD}@${BUILD_HOST}/${CIVICRM_SCHEMA_PREFIX}{{db_seq}}
+export
PRECREATED_DSN_PATTERN=mysql://${CIVICRM_MYSQL_USERNAME}:${CIVICRM_MYSQL_PASSWORD}@${CIVICRM_MYSQL_CLIENT}/${CIVICRM_SCHEMA_PREFIX}{{db_seq}}
#FIXME: --web-root=$WORKSPACE/src/crm
diff --git a/bin/ci-settings.sh b/bin/ci-settings.sh
index 3c48bd2..5824124 100644
--- a/bin/ci-settings.sh
+++ b/bin/ci-settings.sh
@@ -15,7 +15,7 @@
CIVICRM_SCHEMA_PREFIX=civicrm_${JOB_ID}_
-BUILD_HOST=`hostname`
+CIVICRM_MYSQL_CLIENT=localhost
# MySQL username is limited to 16 chars, use build number as an identifier:
CIVICRM_MYSQL_USERNAME=civitest_${BUILD_NUMBER}
--
To view, visit https://gerrit.wikimedia.org/r/195002
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4f326d1d931ae1de3b5356384cc8c7a90e59d5cf
Gerrit-PatchSet: 4
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Katie Horn kh...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't include civicrm_webtest - change (wikimedia...civicrm-buildkit)
Ejegg has submitted this change and it was merged. Change subject: Don't include civicrm_webtest .. Don't include civicrm_webtest This is an external thing. Change-Id: I179b8e6c04737f67edd2996bd6cdb85a921758c2 --- M app/config/wmff/install.sh 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Ejegg: Verified; Looks good to me, approved diff --git a/app/config/wmff/install.sh b/app/config/wmff/install.sh index 64af4b7..641c84a 100644 --- a/app/config/wmff/install.sh +++ b/app/config/wmff/install.sh @@ -79,7 +79,6 @@ drush php-eval -u $ADMIN_USER 'module_load_include(inc,block,block.admin); block_admin_display();' ## Setup demo user -drush -y en civicrm_webtest drush -y user-create --password=$DEMO_PASS --mail=$DEMO_EMAIL $DEMO_USER #drush -y user-add-role civicrm_webtest_user $DEMO_USER # In Garland, CiviCRM's toolbar looks messy unless you also activate Drupal's toolbar, so grant access toolbar -- To view, visit https://gerrit.wikimedia.org/r/195058 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I179b8e6c04737f67edd2996bd6cdb85a921758c2 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/civicrm-buildkit Gerrit-Branch: master Gerrit-Owner: Awight awi...@wikimedia.org Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com Gerrit-Reviewer: Awight awi...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Katie Horn kh...@wikimedia.org Gerrit-Reviewer: Ssmith ssm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] We don't use the devel module in tests - change (wikimedia...civicrm-buildkit)
Ejegg has submitted this change and it was merged. Change subject: We don't use the devel module in tests .. We don't use the devel module in tests Change-Id: Ic2175592d11dba0052c4536d056cdcb05bc8401c --- M app/config/wmff/install.sh 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Ejegg: Verified; Looks good to me, approved diff --git a/app/config/wmff/install.sh b/app/config/wmff/install.sh index 641c84a..6f5cf4f 100644 --- a/app/config/wmff/install.sh +++ b/app/config/wmff/install.sh @@ -37,7 +37,6 @@ garland \ contribution_audit \ contribution_tracking \ - devel \ environment_indicator \ exchange_rates \ ganglia_reporter \ -- To view, visit https://gerrit.wikimedia.org/r/195065 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic2175592d11dba0052c4536d056cdcb05bc8401c Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/civicrm-buildkit Gerrit-Branch: master Gerrit-Owner: Awight awi...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Handle dates more carefully in recurring messages - change (wikimedia...crm)
Ejegg has submitted this change and it was merged.
Change subject: Handle dates more carefully in recurring messages
..
Handle dates more carefully in recurring messages
The message timestamp on subscription signup messages was being set incorrectly
to the current time or the payment date. This wouldn't have corrupted data,
because the timestamp is not stored nor used for currency conversion, but it
was a problem for tests where the currency is mocked by exact time.
Change-Id: I04fe4365d8933d714b96a13af07ad864c7017897
---
M sites/all/modules/queue2civicrm/recurring/recurring.module
1 file changed, 10 insertions(+), 3 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/queue2civicrm/recurring/recurring.module
b/sites/all/modules/queue2civicrm/recurring/recurring.module
index 2ebf20d..6d6d302 100644
--- a/sites/all/modules/queue2civicrm/recurring/recurring.module
+++ b/sites/all/modules/queue2civicrm/recurring/recurring.module
@@ -497,7 +497,9 @@
function recurring_normalize_paypal_msg( $msg ) {
$msg_normalized = array();
- $timestamp = ( !isset( $msg[ 'payment_date' ] ) || !strlen( $msg[
'payment_date' ] )) ? strtotime( now ) : strtotime( $msg[ 'payment_date' ] );
+ if ( isset( $msg['payment_date'] ) ) {
+$msg_normalized['date'] = strtotime( $msg['payment_date'] );
+ }
// the subscription id
$msg_normalized[ 'subscr_id' ] = $msg[ 'subscr_id' ];
@@ -612,8 +614,11 @@
} elseif( $msg[ 'txn_type' ] == 'subscr_cancel' ) {
$msg_normalized[ 'cancel_date' ] = strtotime( $msg[ 'subscr_date' ] );
}
+ if ( !isset( $msg_normalized['date'] ) ) {
+$msg_normalized['date'] = strtotime( $msg['subscr_date'] );
+ }
}
-
+
if ( $msg[ 'txn_type' ] == 'subscr_modify' ) {
$msg_normalized[ 'modified_date' ] = $msg[ 'subscr_effective' ];
}
@@ -631,7 +636,9 @@
$msg_normalized[ 'gateway' ] = ( !empty( $msg['gateway'] ) ? $msg['gateway']
: 'paypal' );
- $msg_normalized[ 'date' ] = $timestamp;
+ if ( !isset( $msg_normalized['date'] ) ) {
+$msg_normalized['date'] = time();
+ }
// FIXME: so dirty.
foreach ( $msg as $key = $value ) {
--
To view, visit https://gerrit.wikimedia.org/r/195050
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I04fe4365d8933d714b96a13af07ad864c7017897
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Katie Horn kh...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] split - explode - change (wikimedia...crm)
Ejegg has submitted this change and it was merged.
Change subject: split - explode
..
split - explode
Deprecated in PHP
Change-Id: I0d4bd9f8fe1a19c4b7bbd394809e810860f2d642
---
M sites/all/modules/queue2civicrm/recurring/recurring.module
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/queue2civicrm/recurring/recurring.module
b/sites/all/modules/queue2civicrm/recurring/recurring.module
index 6d6d302..abc63bb 100644
--- a/sites/all/modules/queue2civicrm/recurring/recurring.module
+++ b/sites/all/modules/queue2civicrm/recurring/recurring.module
@@ -520,7 +520,7 @@
$msg_normalized[ 'last_name' ] = $msg[ 'last_name' ];
if ( isset( $msg['address_street'] ) ) {
- $split = split(\n, str_replace(\r, '', $msg[ 'address_street'
]));
+ $split = explode(\n, str_replace(\r, '', $msg[ 'address_street'
]));
$msg_normalized[ 'street_address' ] = $split[0];
if ( count( $split ) 1 ) {
$msg_normalized[ 'supplemental_address_1' ] = $split[1];
@@ -531,10 +531,10 @@
$msg_normalized[ 'postal_code' ] = $msg[ 'address_zip' ];
// Shipping info (address same as above since PayPal only passes 1
address)
- $split = split( , $msg[ 'address_name' ]);
+ $split = explode( , $msg[ 'address_name' ]);
$msg_normalized[ 'last_name_2' ] = array_pop($split);
$msg_normalized[ 'first_name_2' ] = implode( , $split);
- $split = split(\n, str_replace(\r, '', $msg[ 'address_street'
]));
+ $split = explode(\n, str_replace(\r, '', $msg[ 'address_street'
]));
$msg_normalized[ 'street_address_2' ] = $split[0];
if ( count( $split ) 1 ) {
$msg_normalized[ 'supplemental_address_2' ] = $split[1];
--
To view, visit https://gerrit.wikimedia.org/r/195051
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0d4bd9f8fe1a19c4b7bbd394809e810860f2d642
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Katie Horn kh...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Mock exchange rates during testing - change (wikimedia...crm)
Ejegg has submitted this change and it was merged.
Change subject: Mock exchange rates during testing
..
Mock exchange rates during testing
Change-Id: Ida1a6e1c48b082fbf4ec61293c3703a86f8a4800
---
M sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
M sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
2 files changed, 24 insertions(+), 0 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
b/sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
index d240271..24a4d31 100644
--- a/sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
+++ b/sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
@@ -16,6 +16,9 @@
$message = new TransactionMessage();
$message2 = new TransactionMessage();
+exchange_rate_cache_set( 'USD', $message-get( 'date' ), 1 );
+exchange_rate_cache_set( $message-get( 'currency' ), $message-get(
'date' ), 3 );
+
queue2civicrm_import( $message );
queue2civicrm_import( $message2 );
@@ -34,6 +37,13 @@
$signup_message = new RecurringSignupMessage( $values );
$message = new RecurringPaymentMessage( $values );
$message2 = new RecurringPaymentMessage( $values );
+
+$subscr_time = strtotime( $signup_message-get( 'subscr_date' ) );
+exchange_rate_cache_set( 'USD', $subscr_time, 1 );
+exchange_rate_cache_set( $signup_message-get('mc_currency'),
$subscr_time, 3 );
+$payment_time = strtotime( $message-get( 'payment_date' ) );
+exchange_rate_cache_set( 'USD', $payment_time, 1 );
+exchange_rate_cache_set( $message-get('mc_currency'), $payment_time,
3 );
recurring_import( $signup_message );
recurring_import( $message );
@@ -62,6 +72,10 @@
'subscr_id' = mt_rand(),
) );
+$payment_time = strtotime( $message-get( 'payment_date' ) );
+exchange_rate_cache_set( 'USD', $payment_time, 1 );
+exchange_rate_cache_set( $message-get('mc_currency'), $payment_time,
3 );
+
recurring_import( $message );
}
@@ -73,6 +87,10 @@
$message = new RecurringPaymentMessage( array(
'subscr_id' = null,
) );
+
+$payment_time = strtotime( $message-get( 'payment_date' ) );
+exchange_rate_cache_set( 'USD', $payment_time, 1 );
+exchange_rate_cache_set( $message-get('mc_currency'), $payment_time,
3 );
recurring_import( $message );
}
@@ -87,6 +105,9 @@
'gross_currency' = $donation_message-get( 'original_currency' ),
) );
+exchange_rate_cache_set( 'USD', $donation_message-get('date'), 1 );
+exchange_rate_cache_set( $donation_message-get('currency'),
$donation_message-get('date'), 3 );
+
queue2civicrm_import( $donation_message );
$contributions = wmf_civicrm_get_contributions_from_gateway_id(
$donation_message-getGateway(), $donation_message-getGatewayTxnId() );
$this-assertEquals( 1, count( $contributions ) );
diff --git
a/sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
b/sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
index 61ffa7c..3c457a9 100644
---
a/sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
+++
b/sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
@@ -7,5 +7,8 @@
if ( !defined( 'DRUPAL_ROOT' ) ) {
throw new Exception( Define DRUPAL_ROOT somewhere before running
unit tests. );
}
+
+global $_exchange_rate_cache;
+$_exchange_rate_cache = array();
}
}
--
To view, visit https://gerrit.wikimedia.org/r/195052
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ida1a6e1c48b082fbf4ec61293c3703a86f8a4800
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Katie Horn kh...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Mark test as skipped directly - change (wikimedia...crm)
Ejegg has submitted this change and it was merged.
Change subject: Mark test as skipped directly
..
Mark test as skipped directly
No need to throw an exception, if we're already in a PHPUnitTestCase subclass.
Change-Id: I04543004c4ae1ca24f45e74a8d13e5d51f40dfd6
---
M sites/all/modules/wmf_civicrm/tests/phpunit/RecurringTest.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/RecurringTest.php
b/sites/all/modules/wmf_civicrm/tests/phpunit/RecurringTest.php
index 3ee0635..1ce8fae 100644
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/RecurringTest.php
+++ b/sites/all/modules/wmf_civicrm/tests/phpunit/RecurringTest.php
@@ -21,7 +21,7 @@
*/
public function testNextScheduled( $now, $cycle_day, $expected_next_sched
) {
if ( defined( 'HHVM_VERSION' ) ) {
-throw new PHPUnit_Framework_SkippedTestError( 'Running under HHVM,
skipping known failure' );
+$this-markTestSkipped( 'Running under HHVM, skipping known
failure' );
}
$msg = array(
--
To view, visit https://gerrit.wikimedia.org/r/195053
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I04543004c4ae1ca24f45e74a8d13e5d51f40dfd6
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove vendor submodule from dev branches - change (mediawiki...DonationInterface)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/195494 Change subject: Remove vendor submodule from dev branches .. Remove vendor submodule from dev branches DO NOT MERGE TO DEPLOYMENT BRANCH. Or if you do, reinstate the vendor submodule immediately after. We need it since we don't want to run composer in production as a part of deployment. Change-Id: I5563d87fecc175fc4f2a7ac9da5ed23783543904 --- M .gitignore D .gitmodules D vendor 3 files changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/94/195494/1 diff --git a/.gitignore b/.gitignore index 334a3b4..73640fa 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,6 @@ *~ *.kate-swp .*.swp - +vendor .version-stamp node_modules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index dc9dce9..000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule vendor] - path = vendor - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface/vendor diff --git a/vendor b/vendor deleted file mode 16 index abd7dd6..000 --- a/vendor +++ /dev/null -Subproject commit abd7dd6c9ac13a780945884e2bd1028ef54b7956 -- To view, visit https://gerrit.wikimedia.org/r/195494 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5563d87fecc175fc4f2a7ac9da5ed23783543904 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Ejegg eeggles...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove vendor submodule from master branch - change (wikimedia...crm)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/195493 Change subject: Remove vendor submodule from master branch .. Remove vendor submodule from master branch It needs to remain on deployment branch, so either don't merge this or add another patch there to reinstate it. Change-Id: Ic310e5dee0dbf3b620b670a11bd376df51bde42d --- M .gitignore M .gitmodules D vendor 3 files changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/93/195493/1 diff --git a/.gitignore b/.gitignore index 4302da2..e7721a1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ sites/default/settings.php sites/default/files .idea +vendor diff --git a/.gitmodules b/.gitmodules index ce1f7f3..3a313e1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [submodule drupal] path = drupal url = https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm/drupal -[submodule vendor] - path = vendor - url = https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm/vendor diff --git a/vendor b/vendor deleted file mode 16 index 5c4e45c..000 --- a/vendor +++ /dev/null -Subproject commit 5c4e45c177923934b41b63a0ab2bb746ad092031 -- To view, visit https://gerrit.wikimedia.org/r/195493 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic310e5dee0dbf3b620b670a11bd376df51bde42d Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: Ejegg eeggles...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't immediately request data when not saved - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/195766
Change subject: Don't immediately request data when not saved
..
Don't immediately request data when not saved
Change-Id: Ie50bd52f2c3bfa4071f44a64af7e884b01239a15
---
M src/app/widgetBase.js
M src/components/widgets/x-by-y/x-by-y.js
2 files changed, 13 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/66/195766/1
diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index 0e0dff8..2fdf2fd 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -10,12 +10,12 @@
self.retrievedResults = ko.observable();
self.queryStringSQL = ko.observable('This widget hasn\'t
been set up yet!');
- self.config = params.configuration;
+ self.config = params.configuration || {};
self.instanceID = params.widgetInstance;
self.widgetCode = params.widgetCode;
self.preDataLoading = ko.observable(true);
- self.dataLoading= ko.observable(!!self.config);
- self.chartSaved = ko.observable(!!self.config);
+ self.dataLoading=
ko.observable(!!params.configuration);
+ self.chartSaved =
ko.observable(!!params.configuration);
self.optionStateChanged = ko.observable(false);
self.chartWidth = ko.observable('900');
self.chartHeight= ko.observable('550');
diff --git a/src/components/widgets/x-by-y/x-by-y.js
b/src/components/widgets/x-by-y/x-by-y.js
index e12e694..7a42f96 100644
--- a/src/components/widgets/x-by-y/x-by-y.js
+++ b/src/components/widgets/x-by-y/x-by-y.js
@@ -13,17 +13,19 @@
WidgetBase.call( this, params );
var self = this;
- var chartDataCall =
self.getChartData(params.configuration.queryString);
+ if ( self.chartSaved() ) {
+ var chartDataCall =
self.getChartData(self.config.queryString);
- $.when( chartDataCall ).then( function( dataArray ){
- self.retrievedResults(dataArray.results);
- self.dataLoading(false);
- self.preDataLoading(false);
+ $.when( chartDataCall ).then( function( dataArray ){
+ self.retrievedResults(dataArray.results);
+ self.dataLoading(false);
+ self.preDataLoading(false);
- self.chartData =
self.processData(self.retrievedResults(), params.configuration.timeBreakout);
+ self.chartData =
self.processData(self.retrievedResults(), params.configuration.timeBreakout);
- self.makeChart(self.chartData);
- });
+ self.makeChart(self.chartData);
+ });
+ }
self.showSlice = ko.observable();
self.bySlice = ko.observable();
@@ -271,14 +273,6 @@
break;
}
};
-
- if(params.configuration){
- self.chartSaved(true);
- //self.makeChart(self.retrievedResults());
-
- } else {
- self.chartSaved(false);
- }
self.showPanelBody = function(area){
$('#'+area+'body').toggleClass('hide');
--
To view, visit https://gerrit.wikimedia.org/r/195766
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie50bd52f2c3bfa4071f44a64af7e884b01239a15
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add .editorconfig - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196020
Change subject: Add .editorconfig
..
Add .editorconfig
Change-Id: I0d42c7ed4bbf1e8c1458a995c2404c36c7556afb
---
A .editorconfig
1 file changed, 14 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/20/196020/1
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000..db0ce25
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,14 @@
+# EditorConfig
+
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.js]
+charset = utf-8
+
+[*.{js, json}]
+indent_style = tab
+
--
To view, visit https://gerrit.wikimedia.org/r/196020
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d42c7ed4bbf1e8c1458a995c2404c36c7556afb
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: Fix x axis labels - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196010
Change subject: WIP: Fix x axis labels
..
WIP: Fix x axis labels
Also simplifies data processing. No longer invents data points
for time periods where no data exists in the database.
Change-Id: I12f0ba790e2668287471f74b5f84a3b969e4f517
---
M src/app/widgetBase.js
M src/components/widgets/x-by-y/x-by-y.js
2 files changed, 87 insertions(+), 315 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/10/196010/1
diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index 3efc24f..9bd2764 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -66,76 +66,49 @@
self.processData = function(rawdata, timescale){
- var dailyDataArray =
['Daily Total'],
- dailyCountArray =
['Daily Count'],
- secondsByHourDonationData = ['Donations
Per Second'],
- dayObj
= {}, returnObj;
+ var timeWord = ( timescale === 'Day' ? 'Dai' :
timescale ) + 'ly',
+ totals = [ timeWord + ' Total'],
+ counts = [ timeWord + ' Count'],
+ xs = [ 'x' ],
+ defaultYear = new Date().getFullYear(),
+ defaultMonth = new Date().getMonth() + 1,
+ tempDate, timeFormat;
+
+ $.each( rawdata, function( index, dataPoint ) {
+ totals.push( dataPoint.usd_total );
+ counts.push( dataPoint.donations );
+
+ tempDate = ( dataPoint.Year || defaultYear ) +
'-';
+ tempDate += ( dataPoint.Month || defaultMonth )
+ '-';
+ tempDate += ( dataPoint.Day || '1' );
+ if ( dataPoint.Hour ) {
+ tempDate += ' ' + dataPoint.Hour +
':00';
+ }
+
+ xs.push( tempDate );
+ } );
switch(timescale){
case 'Year':
+ timeFormat = '%Y';
+ break;
case 'Month':
- var monthlyDataArray = ['Monthly
Total'],
- monthlyCountArray = ['Monthly Count'],
- months = rawdata;
-
- $.each(months, function(i, el){
-
monthlyDataArray.push(el.usd_total);
-
monthlyCountArray.push(el.donations);
- });
-
- returnObj = {
- timescale: timescale,
- monthlyDataArray:
monthlyDataArray,
- monthlyCountArray:
monthlyCountArray
- };
- return returnObj;
+ timeFormat = '%b \'%y';
+ break;
case 'Day':
+ timeFormat = '%b %e';
+ break;
case 'Hour':
- for (var d = 1; d 32; d++) {
- dailyDataArray[d] = 0;
- dailyCountArray[d] = 0;
- if (!dayObj[d]) {
- dayObj[d] = new
Array(25);
- dayObj[d][0] = 'Hourly
Totals';
- for (var h = 0; h 24;
h++) {
- dayObj[d][h +
1] = { total: 0, count: 0 };
-
secondsByHourDonationData[(d - 1) * 24 + h + 1] = 0;
- }
- }
- }
-
- var dataCount = rawdata.length;
- for (var i = 0; i dataCount; i++ ) {
-
- var el =
[MediaWiki-commits] [Gerrit] Add JSHint configuration - change (wikimedia...crm)
Ejegg has submitted this change and it was merged.
Change subject: Add JSHint configuration
..
Add JSHint configuration
Change-Id: I3712813b971bf5b6946c63ab7aca25fb13e520dc
---
A .jshintignore
A .jshintrc
2 files changed, 15 insertions(+), 0 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/.jshintignore b/.jshintignore
new file mode 100644
index 000..543356f
--- /dev/null
+++ b/.jshintignore
@@ -0,0 +1,6 @@
+civicrm
+drupal
+modules/civicrm
+modules/contrib
+sites/all/modules
+vendor
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 000..cf7ef14
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,9 @@
+{
+ predef: [
+ ],
+
+ undef: true,
+ unused: true,
+
+ browser: true
+}
--
To view, visit https://gerrit.wikimedia.org/r/195355
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3712813b971bf5b6946c63ab7aca25fb13e520dc
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Katie Horn kh...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix board nav links - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/195979
Change subject: Fix board nav links
..
Fix board nav links
Change-Id: I4b11ac67ded6d256661b8e1b1be740fee7ea1ba5
---
M src/components/app-content/app-content.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/79/195979/1
diff --git a/src/components/app-content/app-content.js
b/src/components/app-content/app-content.js
index dce8604..8fcc426 100644
--- a/src/components/app-content/app-content.js
+++ b/src/components/app-content/app-content.js
@@ -42,7 +42,7 @@
var pages = ['Library', 'Profile', 'Home'], view = data.target.id;
if( pages.indexOf(data.target.id) -1 ){
self.displayPage(view);
-} else if( typeof view !== 'number' ) {
+} else if( isNaN( parseInt( view ) ) ) {
self.displayPage($.trim($(data.target).text()));
} else {
$.get('board/' + view, function( bdata ){
--
To view, visit https://gerrit.wikimedia.org/r/195979
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b11ac67ded6d256661b8e1b1be740fee7ea1ba5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix time display, remove refresh and profile btns - change (wikimedia...dash)
Ejegg has submitted this change and it was merged.
Change subject: Fix time display, remove refresh and profile btns
..
Fix time display, remove refresh and profile btns
edited to convert spaces to tabs
Change-Id: Ia0bbb34c0101647d5e17317453db763e94e93db8
---
M src/components/boards/generic-board/generic-board.html
M src/components/nav-bar/nav-bar.html
M src/components/widgets/x-by-y/x-by-y.html
M src/components/widgets/x-by-y/x-by-y.js
4 files changed, 157 insertions(+), 132 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/src/components/boards/generic-board/generic-board.html
b/src/components/boards/generic-board/generic-board.html
index dcdcc9e..7797fae 100644
--- a/src/components/boards/generic-board/generic-board.html
+++ b/src/components/boards/generic-board/generic-board.html
@@ -6,9 +6,9 @@
p data-bind=text: displayDate/p
/div
div class=col-md-8 titleCol
-div class=btn-group btn-group-xs pull-right
+!-- div class=btn-group btn-group-xs pull-right
button type=button class=btn btn-default
data-bind=click: reloadBoardi class=fa fa-refresh
style=padding-right:5px/i Refresh/button
-/div
+/div --
/div
/div
diff --git a/src/components/nav-bar/nav-bar.html
b/src/components/nav-bar/nav-bar.html
index b1fb42a..6e2a1c1 100644
--- a/src/components/nav-bar/nav-bar.html
+++ b/src/components/nav-bar/nav-bar.html
@@ -27,7 +27,7 @@
div class=hide subNavBoardOpts
subNavButton id=profileLinks
ul
lia
href=/logoutLog out/a/li
- li id=Profile
data-bind=click: $parent.setDisplayPageProfile/li
+ !-- li id=Profile
data-bind=click: $parent.setDisplayPageProfile/li --
/ul
/div
/span
diff --git a/src/components/widgets/x-by-y/x-by-y.html
b/src/components/widgets/x-by-y/x-by-y.html
index 3229239..27185a9 100644
--- a/src/components/widgets/x-by-y/x-by-y.html
+++ b/src/components/widgets/x-by-y/x-by-y.html
@@ -1,52 +1,52 @@
div class=row
span data-bind=if: preDataLoading
- div class=loadingWidget
- img src=/images/catloader.gif /
- h3 class=text-centerLoading./h3
-/div
-/span
+ div class=loadingWidget
+ img src=/images/catloader.gif /
+ h3 class=text-centerLoading./h3
+ /div
+ /span
div class=panel panel-purple
-div class=panel-heading
- div class=btn-group btn-group-xs pull-right
- button type=button class=btn btn-default
dropdown-toggle data-toggle=modal data-target=#XYsqlModali class=fa
fa-database/i/button
- !-- button type=button id=savedCharts class=btn
btn-default dropdown-toggle data-toggle=dropdown
data-target=#XYsavedCharti class=fa fa-area-chart/i Saved
charts.../button
- ul class=dropdown-menu role=menu
aria-labelledby=savedCharts id=savedChartsMenu data-bind=foreach:
presetTitles, style: { width: '300px'}
+ div class=panel-heading
+ div class=btn-group btn-group-xs pull-right
+ button type=button class=btn btn-default
dropdown-toggle data-toggle=modal data-target=#XYsqlModali class=fa
fa-database/i/button
+ !-- button type=button id=savedCharts
class=btn btn-default dropdown-toggle data-toggle=dropdown
data-target=#XYsavedCharti class=fa fa-area-chart/i Saved
charts.../button
+ ul class=dropdown-menu role=menu
aria-labelledby=savedCharts id=savedChartsMenu data-bind=foreach:
presetTitles, style: { width: '300px'}
li data-bind=text: $data/li
/ul --
- /div
-/div
+ /div
+ /div
-div class=panel-body
-div class=row-fluid
- div class=col-md-3 col-sm-12
+ div class=panel-body
+ div class=row-fluid
+ div class=col-md-3 col-sm-12
- div class=row
- div class=well lightWell col-md-12
- form id=XYform data-bind=event:
{change: logStateChange(true)}
- div class=row-fluid
- h4Show:/h4
- select
[MediaWiki-commits] [Gerrit] Clean up some Adyen cruft - change (mediawiki...DonationInterface)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194774
Change subject: Clean up some Adyen cruft
..
Clean up some Adyen cruft
Variables hadn't been used since the dawn of git.
Change-Id: Iecb931609919e0f1259d3d91b168e875c19917a1
---
M adyen_gateway/adyen_resultswitcher.body.php
1 file changed, 3 insertions(+), 24 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/74/194774/1
diff --git a/adyen_gateway/adyen_resultswitcher.body.php
b/adyen_gateway/adyen_resultswitcher.body.php
index 4a29198..9121c15 100644
--- a/adyen_gateway/adyen_resultswitcher.body.php
+++ b/adyen_gateway/adyen_resultswitcher.body.php
@@ -2,33 +2,12 @@
class AdyenGatewayResult extends GatewayPage {
- /**
-* Defines the action to take on a Adyen transaction.
-*
-* Possible values include 'process', 'challenge',
-* 'review', 'reject'. These values can be set during
-* data processing validation, for instance.
-*
-* Hooks are exposed to handle the different actions.
-*
-* FIXME: sketchy to have a default value.
-* Defaults to 'process'.
-* @var string
-*/
- public $action = 'process';
-
- /**
-* An array of form errors
-* @var array
-*/
- public $errors = array( );
-
public function __construct() {
$this-adapter = new AdyenAdapter();
parent::__construct();
}
-protected function handleRequest() {
-$this-handleResultRequest();
-}
+ protected function handleRequest() {
+ $this-handleResultRequest();
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/194774
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iecb931609919e0f1259d3d91b168e875c19917a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] HHVM compatibility when using php -r - change (wikimedia...civicrm-buildkit)
Ejegg has submitted this change and it was merged.
Change subject: HHVM compatibility when using php -r
..
HHVM compatibility when using php -r
HHVM tries to interpret command-line arguments instead of passing them to
the script. A double-dash ensures that arguments are passed to the script.
This is compatible with Zend PHP.
Change-Id: Ie6d8109f9324564d02c3754b6acf1e5721ca91c6
---
M src/civibuild.lib.sh
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Ejegg: Verified; Looks good to me, approved
diff --git a/src/civibuild.lib.sh b/src/civibuild.lib.sh
index e5e511c..c450f2b 100644
--- a/src/civibuild.lib.sh
+++ b/src/civibuild.lib.sh
@@ -146,7 +146,7 @@
## example: $(cvutil_parse_site_name_id drupal-demo/2) ==
SITE_NAME=drupal-demo SITE_ID=2
## example: $(cvutil_parse_site_name_id drupal-demo) ==
SITE_NAME=drupal-demo
function cvutil_parse_site_name_id() {
- php -r '$parts=explode(/, $argv[1]);echo SITE_NAME= . $parts[0].\n; if
(isset($parts[1])) echo SITE_ID= . $parts[1] . \n;' $1
+ php -r '$parts=explode(/, $argv[1]);echo SITE_NAME= . $parts[0].\n; if
(isset($parts[1])) echo SITE_ID= . $parts[1] . \n;' -- $1
}
###
@@ -222,7 +222,7 @@
local ttl=${3:-$CACHE_TTL}
if [ -f $cachefile -a -f $lastrun ]; then
-if php -r 'exit($argv[1] + file_get_contents($argv[2]) time() ? 1 : 0);'
$ttl $lastrun ; then
+if php -r 'exit($argv[1] + file_get_contents($argv[2]) time() ? 1 : 0);'
-- $ttl $lastrun ; then
echo SKIP: http_cache_setup '$url' $cachefile' (recently updated;
ttl=$ttl)
return
fi
@@ -740,7 +740,7 @@
if [ $2 == default ]; then
echo default
else
-php -r '$p = parse_url($argv[1]); if (!empty($p[port])) echo $p[port]
. .; echo $p[host];' $1
+php -r '$p = parse_url($argv[1]); if (!empty($p[port])) echo $p[port]
. .; echo $p[host];' -- $1
fi
}
@@ -792,7 +792,7 @@
## TODO: defensive programming: $cachedir should not end in /
if [ -d $cachedir -a -f $lastrun -a -z $FORCE_DOWNLOAD ]; then
-if php -r 'exit($argv[1] + file_get_contents($argv[2]) time() ? 1 : 0);'
$CACHE_TTL $lastrun ; then
+if php -r 'exit($argv[1] + file_get_contents($argv[2]) time() ? 1 : 0);'
-- $CACHE_TTL $lastrun ; then
echo SKIP: git_cache_setup '$url' $cachedir' (recently updated;
ttl=$CACHE_TTL)
return
fi
@@ -865,7 +865,7 @@
## TODO: defensive programming: $cachedir should not end in /
if [ -d $cachedir -a -f $lastrun -a -z $FORCE_DOWNLOAD ]; then
-if php -r 'exit($argv[1] + file_get_contents($argv[2]) time() ? 1 : 0);'
$CACHE_TTL $lastrun ; then
+if php -r 'exit($argv[1] + file_get_contents($argv[2]) time() ? 1 : 0);'
-- $CACHE_TTL $lastrun ; then
echo SKIP: svn_cache_setup '$url' $cachedir' (recently updated;
ttl=$CACHE_TTL)
return
fi
--
To view, visit https://gerrit.wikimedia.org/r/194937
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6d8109f9324564d02c3754b6acf1e5721ca91c6
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/civicrm-buildkit
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Katie Horn kh...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: Totten t...@onebitwise.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update packages - change (wikimedia...vendor)
Ejegg has submitted this change and it was merged. Change subject: update packages .. update packages There's something wrong with phpunit/phpunit-selenium, strange that this update didn't fix it... Change-Id: I153bd4afcdfcd533f6fe36190b461fd8f6772eba --- M autoload.php M composer/autoload_files.php M composer/autoload_namespaces.php M composer/autoload_real.php M composer/include_paths.php M composer/installed.json M symfony/config/Symfony/Component/Config/Definition/ArrayNode.php M symfony/config/Symfony/Component/Config/Definition/BaseNode.php M symfony/config/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php M symfony/config/Symfony/Component/Config/Definition/Builder/BooleanNodeDefinition.php M symfony/config/Symfony/Component/Config/Definition/Builder/EnumNodeDefinition.php M symfony/config/Symfony/Component/Config/Definition/Builder/ExprBuilder.php M symfony/config/Symfony/Component/Config/Definition/Builder/MergeBuilder.php M symfony/config/Symfony/Component/Config/Definition/Builder/NodeBuilder.php M symfony/config/Symfony/Component/Config/Definition/Builder/NodeDefinition.php M symfony/config/Symfony/Component/Config/Definition/Builder/NodeParentInterface.php M symfony/config/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php M symfony/config/Symfony/Component/Config/Definition/Builder/ParentNodeDefinitionInterface.php M symfony/config/Symfony/Component/Config/Definition/Builder/ScalarNodeDefinition.php M symfony/config/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php M symfony/config/Symfony/Component/Config/Definition/Builder/VariableNodeDefinition.php M symfony/config/Symfony/Component/Config/Definition/ConfigurationInterface.php M symfony/config/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php M symfony/config/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php M symfony/config/Symfony/Component/Config/Definition/Exception/Exception.php M symfony/config/Symfony/Component/Config/Definition/NodeInterface.php M symfony/config/Symfony/Component/Config/Definition/NumericNode.php M symfony/config/Symfony/Component/Config/Definition/PrototypedArrayNode.php M symfony/config/Symfony/Component/Config/Definition/VariableNode.php M symfony/config/Symfony/Component/Config/Exception/FileLoaderImportCircularReferenceException.php M symfony/config/Symfony/Component/Config/Exception/FileLoaderLoadException.php M symfony/config/Symfony/Component/Config/LICENSE M symfony/config/Symfony/Component/Config/Resource/DirectoryResource.php M symfony/config/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php M symfony/config/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php M symfony/config/Symfony/Component/Config/Tests/Definition/Builder/TreeBuilderTest.php M symfony/config/Symfony/Component/Config/Tests/Definition/PrototypedArrayNodeTest.php M symfony/config/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php M symfony/config/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php M symfony/config/Symfony/Component/Config/Util/XmlUtils.php M symfony/config/Symfony/Component/Config/phpunit.xml.dist M symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php M symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php M symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php M symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php M symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/CompilerPassInterface.php M symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php M symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php M symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php M symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/PassConfig.php M symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/RemoveAbstractDefinitionsPass.php M symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/RemovePrivateAliasesPass.php M symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php M symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php M symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphEdge.php M symfony/dependency-injection/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php M symfony/dependency-injection/Symfony/Component/DependencyInjection/Container.php M
[MediaWiki-commits] [Gerrit] Add widget instances to user default board - change (wikimedia...dash)
Ejegg has submitted this change and it was merged.
Change subject: Add widget instances to user default board
..
Add widget instances to user default board
This could be better.. there should be a better flow for adding multiple
instances, for example.
Change-Id: I6739adc15eefe41b6c51c0ce367da3f4b1df4101
---
M src/components/app-content/app-content.html
M src/components/app-content/app-content.js
M src/components/widgets/fraud-gauge/fraud-gauge.js
M src/css/style.css
4 files changed, 55 insertions(+), 3 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/src/components/app-content/app-content.html
b/src/components/app-content/app-content.html
index fd086ea..c3ac744 100644
--- a/src/components/app-content/app-content.html
+++ b/src/components/app-content/app-content.html
@@ -29,7 +29,9 @@
li
img data-bind=attr: {src:
previewPath}
h3 data-bind=text: displayName/h3
- p data-bind=text: description/p
+ p class=widgetDesc data-bind=text:
description/p
+ button class=btn btn-block btn-col
btn-primary addToBoardBtn data-bind=attr: { id: 'add-widget-'+id }, click:
$parent.addWidgetToBoardAdd to my default board/button
+ button class=hide btn btn-block
btn-col btn-success addToBoardBtn data-bind=attr: { id: 'saved-widget-'+id },
click: $parent.addWidgetToBoardi class=fa fa-check-circle-o/i
Added./button
/li
/ul
/div
diff --git a/src/components/app-content/app-content.js
b/src/components/app-content/app-content.js
index 49b3c65..a6e51c1 100644
--- a/src/components/app-content/app-content.js
+++ b/src/components/app-content/app-content.js
@@ -17,6 +17,8 @@
self.widgetTemplates = ko.observableArray();
self.widgetInstances = ko.observableArray();
+
+
//Get user info and configs like default board
$.get('/user/info', function(userInfo) {
if (userInfo) {
@@ -38,6 +40,42 @@
}
});
+self.addWidgetToBoard = function( event, data ){
+var widgetIDToAdd;
+console.log('event: ', event);
+console.log('data', data.target.id);
+
+//create an instance of the widget
+$.ajax({
+method: 'POST',
+url: '/widget-instance',
+contentType: 'application/json; charset=UTF-8',
+data: JSON.stringify({
+widgetId: event.id,
+displayName: 'My ' + event.displayName,
+configuration: {},
+isShared: false
+}),
+success: function( data ) {
+widgetIDToAdd = data.id;
+self.displayedBoard().widgets.push(data.id);
+
+$.ajax({
+method: 'PUT',
+url: '/board/' + self.userdata().defaultBoard,
+contentType: 'application/json; charset=UTF-8',
+data: JSON.stringify(self.displayedBoard()),
+success: function(stuff) {
+//change the look of the add widget button
+$('#add-widget-'+event.id).hide();
+$('#saved-widget-'+event.id).removeClass('hide');
+}
+});
+}
+});
+
+};
+
self.setDisplayPage = function(e, data){
var pages = ['Library', 'Profile', 'Home'], view = data.target.id;
if( pages.indexOf(data.target.id) -1 ){
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.js
b/src/components/widgets/fraud-gauge/fraud-gauge.js
index 8fca0bd..3baecae 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.js
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.js
@@ -33,7 +33,7 @@
var self = this;
self.filters = ko.observableArray();
self.title = ko.observable(params.title);
-console.log('fraud widget params: ', params);
+
self.columnSize = 'col-md-' + params.configuration.width + ' fraudGauge';
$.get( 'metadata/fraud-gauge', function(reqData){
diff --git a/src/css/style.css b/src/css/style.css
index f0a0982..9561bb0 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -378,6 +378,14 @@
width: 100%;
}
+.addToBoardBtn {
+bottom: 0;
+}
+
+.widgetDesc {
+height: 70px;
+}
+
/* BOOTSTRAP OVERRIDES */
.btn {
@@ -598,12 +606,16 @@
background-color: rgba(49,176,213,0.6);
color: #f5f5f5;
width: 250px;
-height: 300px;
+height: 320px;
overflow: hidden;
[MediaWiki-commits] [Gerrit] Fetch/use user default board for lib widget adds - change (wikimedia...dash)
Ejegg has submitted this change and it was merged.
Change subject: Fetch/use user default board for lib widget adds
..
Fetch/use user default board for lib widget adds
Change-Id: Id4242ee05d6edaa73cfe0d9f3cbea0c2f0797ef5
---
M src/components/app-content/app-content.html
M src/components/app-content/app-content.js
2 files changed, 54 insertions(+), 43 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/src/components/app-content/app-content.html
b/src/components/app-content/app-content.html
index c3ac744..5dd94f8 100644
--- a/src/components/app-content/app-content.html
+++ b/src/components/app-content/app-content.html
@@ -31,7 +31,7 @@
h3 data-bind=text: displayName/h3
p class=widgetDesc data-bind=text:
description/p
button class=btn btn-block btn-col
btn-primary addToBoardBtn data-bind=attr: { id: 'add-widget-'+id }, click:
$parent.addWidgetToBoardAdd to my default board/button
- button class=hide btn btn-block
btn-col btn-success addToBoardBtn data-bind=attr: { id: 'saved-widget-'+id },
click: $parent.addWidgetToBoardi class=fa fa-check-circle-o/i
Added./button
+ button class=hide btn btn-block
btn-col btn-success addToBoardBtn data-bind=attr: { id: 'saved-widget-'+id
}i class=fa fa-check-circle-o/i Added./button
/li
/ul
/div
diff --git a/src/components/app-content/app-content.js
b/src/components/app-content/app-content.js
index a6e51c1..c24ee35 100644
--- a/src/components/app-content/app-content.js
+++ b/src/components/app-content/app-content.js
@@ -2,37 +2,34 @@
[ 'jquery',
'knockout',
'text!./app-content.html'
-], function( $, ko, templateMarkup) {
+], function( $, ko, templateMarkup ) {
-function AppContent(params) {
+function AppContent( params ) {
var self = this;
-self.url = params.url || 'hi';
-self.displayedBoard = ko.observable();
-self.userBoards = ko.observableArray();
-self.userdata = ko.observableArray();
-self.displayPage = ko.observable('Home');
-self.loggedIn = ko.observable(false);
-self.welcome = ko.observable('');
-self.widgetTemplates = ko.observableArray();
-self.widgetInstances = ko.observableArray();
+self.url= params.url || 'hi';
+self.displayedBoard = ko.observable();
+self.userBoards = ko.observableArray();
+self.userdata = ko.observableArray();
+self.displayPage= ko.observable('Home');
+self.loggedIn = ko.observable(false);
+self.welcome= ko.observable('');
+self.widgetTemplates= ko.observableArray();
+self.widgetInstances= ko.observableArray();
-
-
-//Get user info and configs like default board
-$.get('/user/info', function(userInfo) {
-if (userInfo) {
+$.get( '/user/info', function( userInfo ) {
+if ( userInfo ) {
self.userdata( userInfo );
self.welcome( userInfo.name.charAt(0).toUpperCase() +
userInfo.name.slice(1) );
self.loggedIn( true );
-$.get('board/' + self.userdata().defaultBoard, function(
moredata ){
+$.get( 'board/' + self.userdata().defaultBoard, function(
moredata ){
self.displayedBoard( moredata );
});
-$.get('board/', function (boards){
-$.each(boards, function(i, board){
-if(board.ownerId === self.userdata().id){
+$.get( 'board/', function ( boards ){
+$.each( boards, function( i, board ){
+if( board.ownerId === self.userdata().id ){
self.userBoards.push(board);
}
});
@@ -42,10 +39,7 @@
self.addWidgetToBoard = function( event, data ){
var widgetIDToAdd;
-console.log('event: ', event);
-console.log('data', data.target.id);
-//create an instance of the widget
$.ajax({
method: 'POST',
url: '/widget-instance',
@@ -57,35 +51,52 @@
isShared: false
}),
success: function( data ) {
-widgetIDToAdd = data.id;
-self.displayedBoard().widgets.push(data.id);
+widgetIDToAdd = data.id; var gettingBoard,
defaultBoardConfig;
-$.ajax({
-method: 'PUT',
-url: '/board/' +
[MediaWiki-commits] [Gerrit] Whitespace - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/195655
Change subject: Whitespace
..
Whitespace
Change-Id: If10dc6bf5b642cad7ccf7ed8052790be8755a9c8
---
M defaults.js
M server.js
M src/app/widgetBase.js
M src/components/widgets/ABTesting/ABTestingMain.js
M src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
M src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
M src/components/widgets/totals-earned-chart/totals-earned-chart.js
M src/components/widgets/x-by-y/x-by-y.js
8 files changed, 652 insertions(+), 652 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/55/195655/1
diff --git a/defaults.js b/defaults.js
index 5e73b05..7a1b81e 100644
--- a/defaults.js
+++ b/defaults.js
@@ -1,18 +1,18 @@
module.exports = {
-listen: '8080',
-dbserver: 'localhost',
-db: 'fredge',
-civicrmDb: 'civicrm',
-dblogin: 'testuser',
-dbpwd: 'testpassword',
+ listen: '8080',
+ dbserver: 'localhost',
+ db: 'fredge',
+ civicrmDb: 'civicrm',
+ dblogin: 'testuser',
+ dbpwd: 'testpassword',
// URL to redirect the user's browser to
-providerURL: 'https://civi.dev/civi',
+ providerURL: 'https://civi.dev/civi',
// BackendURL will be used for direct Dash-Drupal requests
-providerBackendURL: 'http://localhost/civi',
-// If providerBackendIP is set, we override DNS resolution for the hostname
-// given in providerBackendURL. This can be useful for SSL behind
firewalls
-consumerKey: 'kKq6LbU4ctDUzubSUdHJ7Pn9NvVWwQ2f',
-consumerSecret: 'JfGs4nnfyoRQ9i9JQeTYP7geCEKQrenX',
-sessionSecret: 'ds87naowiy3icaywri73tcin7eyyeI8634I71NYFIEA764',
-cacheDuration: 30 // 5 min in ms
+ providerBackendURL: 'http://localhost/civi',
+ // If providerBackendIP is set, we override DNS resolution for the
hostname
+ // given in providerBackendURL. This can be useful for SSL behind
firewalls
+ consumerKey: 'kKq6LbU4ctDUzubSUdHJ7Pn9NvVWwQ2f',
+ consumerSecret: 'JfGs4nnfyoRQ9i9JQeTYP7geCEKQrenX',
+ sessionSecret: 'ds87naowiy3icaywri73tcin7eyyeI8634I71NYFIEA764',
+ cacheDuration: 30 // 5 min in ms
};
diff --git a/server.js b/server.js
index 565b3b2..13663ce 100644
--- a/server.js
+++ b/server.js
@@ -1,15 +1,15 @@
-var express = require( 'express' ),
-app = express(),
-routes= require( './routes'),
-passport = require( 'passport' ),
-DrupalStrategy= require( 'passport-drupal' ).DrupalStrategy,
-evilDns = require( 'evil-dns' ),
-url = require( 'url' ),
-logger= require( './logger.js' ),
-config= require( './config.js' ),
-persistence = require( './persistence.js' ),
-server,
-serverConfig;
+var express= require( 'express' ),
+ app = express(),
+ routes = require( './routes'),
+ passport= require( 'passport' ),
+ DrupalStrategy = require( 'passport-drupal' ).DrupalStrategy,
+ evilDns = require( 'evil-dns' ),
+ url = require( 'url' ),
+ logger = require( './logger.js' ),
+ config = require( './config.js' ),
+ persistence = require( './persistence.js' ),
+ server,
+ serverConfig;
logger.debug( 'Dash starting up' );
@@ -20,8 +20,8 @@
serverConfig = /(([0-9\.]*|\[[0-9a-fA-F\:]*\]):)?([0-9]+)/.exec(config.listen);
if (!serverConfig) {
-logger.error( 'Server cannot listen on ' + config.listen + ', invalid
format.' );
-process.exit(1);
+ logger.error( 'Server cannot listen on ' + config.listen + ', invalid
format.' );
+ process.exit(1);
}
logger.debug( 'Will try to listen on IP address: ' + serverConfig[2] );
@@ -121,9 +121,9 @@
});
server = app.listen(
- serverConfig[3],
- serverConfig[2],
- function() {
- logger.info( 'Dash listening on port ' +
server.address().port );
- }
+ serverConfig[3],
+ serverConfig[2],
+ function() {
+ logger.info( 'Dash listening on port ' + server.address().port
);
+ }
);
diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index f1dd56b..2eb161f 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -1,7 +1,7 @@
define([
'jquery',
- 'knockout',
- 'momentjs'
+ 'knockout',
+ 'momentjs'
], function( $, ko, moment ){
function WidgetBase( params ){
@@ -15,20 +15,20 @@
self.widgetCode = params.widgetCode;
self.preDataLoading =
[MediaWiki-commits] [Gerrit] Data retrieval/superclassing. - change (wikimedia...dash)
Ejegg has submitted this change and it was merged.
Change subject: Data retrieval/superclassing.
..
Data retrieval/superclassing.
Change-Id: I8c685154bf3da6659996a5104dfd30115f9e30d1
---
M src/app/require.config.js
A src/app/widgetBase.js
M src/components/app-content/app-content.js
M src/components/boards/generic-board/generic-board.html
M src/components/nav-bar/nav-bar.html
M src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
M src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
M src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
M src/components/widgets/fraud-gauge/fraud-gauge.html
M src/components/widgets/fraud-gauge/fraud-gauge.js
M src/components/widgets/x-by-y/x-by-y.html
M src/components/widgets/x-by-y/x-by-y.js
M src/css/style.css
M widgets/x-by-y.js
14 files changed, 771 insertions(+), 235 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/src/app/require.config.js b/src/app/require.config.js
index 68a15b5..4b15b77 100644
--- a/src/app/require.config.js
+++ b/src/app/require.config.js
@@ -24,7 +24,8 @@
'select2': 'bower_modules/select2//select2',
'c3': 'bower_modules/c3/c3',
'numeraljs':'bower_modules/numeraljs/numeral',
-'decemberData': 'bower_modules/fakeData/decemberData'
+'decemberData': 'bower_modules/fakeData/decemberData',
+'WidgetBase': 'app/widgetBase'
},
shim: {
'bootstrap': {
diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
new file mode 100644
index 000..f1dd56b
--- /dev/null
+++ b/src/app/widgetBase.js
@@ -0,0 +1,215 @@
+define([
+ 'jquery',
+ 'knockout',
+ 'momentjs'
+], function( $, ko, moment ){
+
+ function WidgetBase( params ){
+
+ var self = this;
+
+ self.retrievedResults = ko.observable();
+ self.queryStringSQL = ko.observable('This widget hasn\'t
been set up yet!');
+ self.config = params.configuration;
+ self.instanceID = params.widgetInstance;
+ self.widgetCode = params.widgetCode;
+ self.preDataLoading = ko.observable(true);
+ self.dataLoading= ko.observable(!!self.config);
+self.chartSaved= ko.observable(!!self.config);
+self.optionStateChanged = ko.observable(false);
+self.chartWidth= ko.observable('900');
+self.chartHeight = ko.observable('550');
+self.chartLoaded = ko.observable(false);
+
+ self.getChartData = function( qs ){
+self.dataLoading(true);
+ return $.ajax({
+ url: '/data/' + self.widgetCode + '?' + ( qs
).replace( /\+/g, '%20' ),
+ success: function ( dataget ) {
+ self.retrievedResults( dataget.results );
+ self.queryStringSQL( dataget.sqlQuery );
+ }
+ });
+ };
+
+ self.saveWidgetConfig = function(){
+
+ if( self.instanceID ){
+ $.ajax({
+ method: 'PUT',
+ url: '/widget-instance/' + self.instanceID,
+ contentType: 'application/json; charset=UTF-8',
+ data: JSON.stringify({
+ configuration: self.config,
+ isShared: false
+ }),
+ success: function( data ) {
+ self.chartSaved(true);
+ }
+ });
+ } else {
+ $.ajax({
+ method: 'POST',
+ url: '/widget-instance/',
+ contentType: 'application/json; charset=UTF-8',
+ data: JSON.stringify({
+ configuration: self.config,
+ isShared: false
+ }),
+ success: function( data ) {
+ self.instanceID = data.id;
+ self.chartSaved(true);
+ }
+ });
+ }
+
+ };
+
+ self.processData = function(rawdata, timescale){
+
+ var dailyDataArray =
['Daily Total'],
+ dailyCountArray =
['Daily Count'],
+
[MediaWiki-commits] [Gerrit] Fix syslog formatting - change (mediawiki...DonationInterface)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196287
Change subject: Fix syslog formatting
..
Fix syslog formatting
No more PID logging, no duplicating label, no error level. Should
match previous format exactly.
Change-Id: I2ae17f05b767c15d23ed0ddf58b267eb522ca718
---
M gateway_common/DonationLoggerFactory.php
1 file changed, 5 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/87/196287/1
diff --git a/gateway_common/DonationLoggerFactory.php
b/gateway_common/DonationLoggerFactory.php
index b472e68..47f1fd8 100644
--- a/gateway_common/DonationLoggerFactory.php
+++ b/gateway_common/DonationLoggerFactory.php
@@ -1,5 +1,6 @@
?php
use Monolog\Logger;
+use Monolog\Formatter\LineFormatter;
use Monolog\Handler\SyslogHandler;
/**
@@ -40,11 +41,14 @@
$logThreshold = $debug ? Logger::DEBUG : Logger::INFO;
if ( $useSyslog ) {
- $handler = new SyslogHandler( $identifier, LOG_USER,
$logThreshold );
+ $handler = new SyslogHandler( $identifier, LOG_USER,
$logThreshold, true, 0 );
} else {
$handler = new WmfFrameworkLogHandler( $identifier,
$logThreshold );
}
+ $formatter = new LineFormatter( '%message%' );
+ $handler-setFormatter( $formatter );
+
if ( $prefixer === null ) {
$prefixer = $gateway;
}
--
To view, visit https://gerrit.wikimedia.org/r/196287
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ae17f05b767c15d23ed0ddf58b267eb522ca718
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (mediawiki...DonationInterface)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/196416 Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment ff4816a Only override MWException if not in mediawiki 83c2225 Localisation updates from https://translatewiki.net. Change-Id: I2ef1151d6a6dc28cbc29bf7902e57ca7598da380 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/16/196416/1 -- To view, visit https://gerrit.wikimedia.org/r/196416 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2ef1151d6a6dc28cbc29bf7902e57ca7598da380 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: deployment Gerrit-Owner: Ejegg eeggles...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (mediawiki...DonationInterface)
Ejegg has submitted this change and it was merged. Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment ff4816a Only override MWException if not in mediawiki 83c2225 Localisation updates from https://translatewiki.net. Change-Id: I2ef1151d6a6dc28cbc29bf7902e57ca7598da380 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Ejegg: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/196416 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2ef1151d6a6dc28cbc29bf7902e57ca7598da380 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: deployment Gerrit-Owner: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Submodule bump for deploy - change (mediawiki/core)
Ejegg has submitted this change and it was merged. Change subject: Submodule bump for deploy .. Submodule bump for deploy Change-Id: I7bdb5b5f7200a162347633a4a3afe34c47aa21ba --- M extensions/DonationInterface 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Ejegg: Verified; Looks good to me, approved diff --git a/extensions/DonationInterface b/extensions/DonationInterface index d7d8d29..8775804 16 --- a/extensions/DonationInterface +++ b/extensions/DonationInterface -Subproject commit d7d8d292d4e332296b00c83080329dffddc6ccbe +Subproject commit 8775804d770cd85f1243b745e18313b0f2c56d0f -- To view, visit https://gerrit.wikimedia.org/r/196419 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7bdb5b5f7200a162347633a4a3afe34c47aa21ba Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_23 Gerrit-Owner: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Submodule bump for deploy - change (mediawiki/core)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/196419 Change subject: Submodule bump for deploy .. Submodule bump for deploy Change-Id: I7bdb5b5f7200a162347633a4a3afe34c47aa21ba --- M extensions/DonationInterface 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/19/196419/1 diff --git a/extensions/DonationInterface b/extensions/DonationInterface index d7d8d29..8775804 16 --- a/extensions/DonationInterface +++ b/extensions/DonationInterface -Subproject commit d7d8d292d4e332296b00c83080329dffddc6ccbe +Subproject commit 8775804d770cd85f1243b745e18313b0f2c56d0f -- To view, visit https://gerrit.wikimedia.org/r/196419 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7bdb5b5f7200a162347633a4a3afe34c47aa21ba Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_23 Gerrit-Owner: Ejegg eeggles...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Only override MWException if not in mediawiki - change (mediawiki...DonationInterface)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196413
Change subject: Only override MWException if not in mediawiki
..
Only override MWException if not in mediawiki
Conditional class declaration. Cool!
Change-Id: If9a0ecfc6251e8e84288b7429a0e473f8fa1dcc0
---
M gateway_common/MWException.drupal.php
1 file changed, 3 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/13/196413/1
diff --git a/gateway_common/MWException.drupal.php
b/gateway_common/MWException.drupal.php
index d2d24f8..4814b27 100644
--- a/gateway_common/MWException.drupal.php
+++ b/gateway_common/MWException.drupal.php
@@ -1,4 +1,6 @@
?php
-class MWException extends Exception {
+if ( !defined( 'MEDIAWIKI' ) ) {
+ class MWException extends Exception {
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/196413
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If9a0ecfc6251e8e84288b7429a0e473f8fa1dcc0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Submodule bump for deploy - change (mediawiki/core)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/196319 Change subject: Submodule bump for deploy .. Submodule bump for deploy Change-Id: I7dad341ddf1678cc36d22488bdd7ddba9bdde832 --- M extensions/DonationInterface 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/19/196319/1 diff --git a/extensions/DonationInterface b/extensions/DonationInterface index 61a5690..d7d8d29 16 --- a/extensions/DonationInterface +++ b/extensions/DonationInterface -Subproject commit 61a5690694ff8472bacbd394c221e42bf828f19f +Subproject commit d7d8d292d4e332296b00c83080329dffddc6ccbe -- To view, visit https://gerrit.wikimedia.org/r/196319 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7dad341ddf1678cc36d22488bdd7ddba9bdde832 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_23 Gerrit-Owner: Ejegg eeggles...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Submodule bump for deploy - change (mediawiki/core)
Ejegg has submitted this change and it was merged. Change subject: Submodule bump for deploy .. Submodule bump for deploy Change-Id: I7dad341ddf1678cc36d22488bdd7ddba9bdde832 --- M extensions/DonationInterface 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Ejegg: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/DonationInterface b/extensions/DonationInterface index 61a5690..d7d8d29 16 --- a/extensions/DonationInterface +++ b/extensions/DonationInterface -Subproject commit 61a5690694ff8472bacbd394c221e42bf828f19f +Subproject commit d7d8d292d4e332296b00c83080329dffddc6ccbe -- To view, visit https://gerrit.wikimedia.org/r/196319 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7dad341ddf1678cc36d22488bdd7ddba9bdde832 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_23 Gerrit-Owner: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Awight awi...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (mediawiki...DonationInterface)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/196309 Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment 7391d7a72088a757519e8435e7dc97189e33ecbf Fix addData calls Change-Id: I34aaf7b554dd057b95dbd2628aa8b25d9717b352 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/09/196309/1 -- To view, visit https://gerrit.wikimedia.org/r/196309 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I34aaf7b554dd057b95dbd2628aa8b25d9717b352 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: deployment Gerrit-Owner: Ejegg eeggles...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (mediawiki...DonationInterface)
Ejegg has submitted this change and it was merged. Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment 7391d7a72088a757519e8435e7dc97189e33ecbf Fix addData calls Change-Id: I34aaf7b554dd057b95dbd2628aa8b25d9717b352 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Ejegg: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/196309 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I34aaf7b554dd057b95dbd2628aa8b25d9717b352 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: deployment Gerrit-Owner: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix addData calls - change (mediawiki...DonationInterface)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196307
Change subject: Fix addData calls
..
Fix addData calls
Change-Id: I97d503dbb979dcfe083989512326170e73a167d0
---
M amazon_gateway/amazon_gateway.body.php
M paypal_gateway/paypal_gateway.body.php
2 files changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/07/196307/1
diff --git a/amazon_gateway/amazon_gateway.body.php
b/amazon_gateway/amazon_gateway.body.php
index a20a901..7792149 100644
--- a/amazon_gateway/amazon_gateway.body.php
+++ b/amazon_gateway/amazon_gateway.body.php
@@ -44,7 +44,7 @@
|| $this-getRequest()-getText(
'recurring', 0 )
) {
// FIXME: do this in the form param
harvesting step
- $this-adapter-addData( array(
+ $this-adapter-addRequestData( array(
'recurring' = 1,
) );
}
diff --git a/paypal_gateway/paypal_gateway.body.php
b/paypal_gateway/paypal_gateway.body.php
index 8ae2b63..5354c57 100644
--- a/paypal_gateway/paypal_gateway.body.php
+++ b/paypal_gateway/paypal_gateway.body.php
@@ -34,7 +34,7 @@
if ( $this-getRequest()-getText( 'ffname', 'default' ) ===
'paypal-recurring' ) {
// FIXME: do this in the form param harvesting step
- $this-adapter-addData( array(
+ $this-adapter-addRequestData( array(
'recurring' = 1,
) );
}
--
To view, visit https://gerrit.wikimedia.org/r/196307
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I97d503dbb979dcfe083989512326170e73a167d0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set dropdown initial values to saved values - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/195767
Change subject: Set dropdown initial values to saved values
..
Set dropdown initial values to saved values
And re-use submit function to get initial data
Change-Id: I64c74faed90923b8851695676745bca60faef85f
---
M src/app/widgetBase.js
M src/components/widgets/x-by-y/x-by-y.js
2 files changed, 16 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/67/195767/1
diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index 2fdf2fd..3def589 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -33,7 +33,6 @@
};
self.saveWidgetConfig = function(){
-
if( self.instanceID ){
$.ajax({
method: 'PUT',
@@ -207,7 +206,7 @@
self.chartSaved(false);
};
- return(this);
+ return this;
}
return( WidgetBase );
diff --git a/src/components/widgets/x-by-y/x-by-y.js
b/src/components/widgets/x-by-y/x-by-y.js
index 7a42f96..e45843b 100644
--- a/src/components/widgets/x-by-y/x-by-y.js
+++ b/src/components/widgets/x-by-y/x-by-y.js
@@ -12,21 +12,6 @@
WidgetBase.call( this, params );
var self = this;
-
- if ( self.chartSaved() ) {
- var chartDataCall =
self.getChartData(self.config.queryString);
-
- $.when( chartDataCall ).then( function( dataArray ){
- self.retrievedResults(dataArray.results);
- self.dataLoading(false);
- self.preDataLoading(false);
-
- self.chartData =
self.processData(self.retrievedResults(), params.configuration.timeBreakout);
-
- self.makeChart(self.chartData);
- });
- }
-
self.showSlice = ko.observable();
self.bySlice = ko.observable();
self.timeChoice = ko.observable();
@@ -298,6 +283,8 @@
//populate user choices dynamically
self.populateChoices = (function(){
+ //Populating the dropdowns may reset this to false;
+ var wasSaved = self.chartSaved();
//populate y slices
$.get( 'metadata/x-by-y', function(reqData){
self.metadata = reqData;
@@ -324,7 +311,10 @@
self.xSlices(xArray);
self.timeChoices(timeArray);
self.groupChoices(groupArray);
-
+ if ( wasSaved ) {
+ self.timeChoice(
self.config.timeBreakout );
+ self.chartSaved( true );
+ }
});
})();
@@ -338,6 +328,7 @@
self.queryRequest.timeBreakout = self.timeChoice();
self.queryString =
self.convertToQuery(self.queryRequest);
+ self.config.showSlice= self.showSlice();
self.config.queryString = self.queryString;
self.config.timeBreakout =
self.queryRequest.timeBreakout;
self.config.chartData = self.chartData;
@@ -347,19 +338,25 @@
$.when( chartDataCall ).then( function( dataArray ){
self.retrievedResults(dataArray.results);
self.dataLoading(false);
+ self.preDataLoading(false);
self.chartData =
self.processData(self.retrievedResults(), self.timeChoice());
self.makeChart(self.chartData);
$('#loadingModal').modal('hide');
- self.chartSaved(false);
});
};
- return(this);
+ if ( self.chartSaved() ) {
+ self.showSlice( self.config.showSlice );
+ self.timeChoice( self.config.timeBreakout );
+ self.submitXY();
+ }
+
+ return this;
}
--
To view, visit https://gerrit.wikimedia.org/r/195767
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I64c74faed90923b8851695676745bca60faef85f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
[MediaWiki-commits] [Gerrit] More whitespace - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/195765
Change subject: More whitespace
..
More whitespace
Change-Id: Ic7a71a1f54b0f12f67de930cb2838787b0c9b5eb
---
M src/app/widgetBase.js
1 file changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/65/195765/1
diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index 2eb161f..0e0dff8 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -85,9 +85,9 @@
});
returnObj = {
-
timescale: timescale,
-
monthlyDataArray: monthlyDataArray,
-
monthlyCountArray: monthlyCountArray
+ timescale: timescale,
+ monthlyDataArray:
monthlyDataArray,
+ monthlyCountArray:
monthlyCountArray
};
return returnObj;
case 'Day':
@@ -109,10 +109,10 @@
for (var i = 0; i dataCount; i++ ) {
var el = rawdata[i],
- day = el.Day,
- hour = el.hour,
- total =
el.usd_total,
- runningTotal =
0;
+ day = el.Day,
+ hour = el.hour,
+ total = el.usd_total,
+ runningTotal = 0;
if(!hour){
dayObj[day+1] = {
total: total, count: el.donations };
@@ -127,11 +127,11 @@
}
returnObj = {
-
timescale: timescale,
-
dailyDataArray: dailyDataArray,
-
dailyCountArray: dailyCountArray,
-
secondsByHourDonationData: secondsByHourDonationData,
-
dayObj: dayObj
+ timescale: timescale,
+ dailyDataArray: dailyDataArray,
+ dailyCountArray:
dailyCountArray,
+ secondsByHourDonationData:
secondsByHourDonationData,
+ dayObj: dayObj
};
return returnObj;
--
To view, visit https://gerrit.wikimedia.org/r/195765
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7a71a1f54b0f12f67de930cb2838787b0c9b5eb
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix time windowing and grouping - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/195807
Change subject: Fix time windowing and grouping
..
Fix time windowing and grouping
If grouping by day, also group by month and add a filter to limit
to less than one month ago. Similarly for month/year.
Change-Id: Ia4132732dc29268a1ca9a5fd66f325a2d3726764
---
M src/app/widgetBase.js
1 file changed, 11 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/07/195807/1
diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index 3def589..3efc24f 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -140,7 +140,16 @@
self.convertToQuery = function( userChoices ){
- var timeBreakout = 'group=' + userChoices.timeBreakout;
+ var timeArray = ['Year', 'Month', 'Day', 'Hour'],
+ index = timeArray.indexOf(
userChoices.timeBreakout ),
+ query = 'group=' + userChoices.timeBreakout;
+
+ // If we're grouping by anything finer than year, add a
filter and
+ // also group by the next level up.
+ if ( index 0 ) {
+ query = query + 'group=' + timeArray[index -
1];
+ query = query + '$filter=' + timeArray[index -
1] + 'sAgo lt \'1\'';
+ }
//groupStr = timeBreakout + 'group=' +
userChoices.xSlice;
// if( userChoices.additionalFilters.length 0 ){
@@ -174,7 +183,7 @@
// } else {
// return groupStr;
// }
- return timeBreakout;
+ return query;
};
// Generate chart label arrays for time increment types
--
To view, visit https://gerrit.wikimedia.org/r/195807
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4132732dc29268a1ca9a5fd66f325a2d3726764
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix 'Not set up' on new widget - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199531
Change subject: Fix 'Not set up' on new widget
..
Fix 'Not set up' on new widget
New fraud gauges weren't showing the chart till you saved and
reloaded
Change-Id: Iff9d8df07617f8dcd4bc3709da1661bef562438d
---
M src/components/widgets/fraud-gauge/fraud-gauge.js
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/31/199531/1
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.js
b/src/components/widgets/fraud-gauge/fraud-gauge.js
index 425bcc1..04482a7 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.js
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.js
@@ -257,6 +257,7 @@
});
} else{
+ self.configSet( true );
//gauge time period
self.queryRequest.timespan =
self.selectedTimePeriod();
--
To view, visit https://gerrit.wikimedia.org/r/199531
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff9d8df07617f8dcd4bc3709da1661bef562438d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update ctools to 7.x-1.7 - change (wikimedia...crm)
Ejegg has submitted this change and it was merged.
Change subject: Update ctools to 7.x-1.7
..
Update ctools to 7.x-1.7
Change-Id: Ifdc607a20dd3296dee25d95bcffe5d8346e969b5
---
M sites/all/modules/contrib/ctools/bulk_export/bulk_export.info
M sites/all/modules/contrib/ctools/ctools.info
M sites/all/modules/contrib/ctools/ctools.module
M
sites/all/modules/contrib/ctools/ctools_access_ruleset/ctools_access_ruleset.info
M sites/all/modules/contrib/ctools/ctools_ajax_sample/ctools_ajax_sample.info
M
sites/all/modules/contrib/ctools/ctools_custom_content/ctools_custom_content.info
M
sites/all/modules/contrib/ctools/ctools_plugin_example/ctools_plugin_example.info
M sites/all/modules/contrib/ctools/includes/content.menu.inc
M sites/all/modules/contrib/ctools/includes/context-admin.inc
A sites/all/modules/contrib/ctools/includes/entity-access.inc
M sites/all/modules/contrib/ctools/page_manager/page_manager.admin.inc
M sites/all/modules/contrib/ctools/page_manager/page_manager.info
M
sites/all/modules/contrib/ctools/page_manager/plugins/task_handlers/http_response.inc
M sites/all/modules/contrib/ctools/page_manager/plugins/tasks/term_view.inc
M sites/all/modules/contrib/ctools/plugins/arguments/entity_id.inc
M sites/all/modules/contrib/ctools/plugins/contexts/user_edit_form.inc
M sites/all/modules/contrib/ctools/plugins/export_ui/ctools_export_ui.class.php
M sites/all/modules/contrib/ctools/stylizer/stylizer.info
M sites/all/modules/contrib/ctools/term_depth/term_depth.info
M
sites/all/modules/contrib/ctools/tests/ctools_export_test/ctools_export_test.info
M sites/all/modules/contrib/ctools/tests/ctools_plugin_test.info
M
sites/all/modules/contrib/ctools/views_content/plugins/content_types/views_panes.inc
M sites/all/modules/contrib/ctools/views_content/views_content.info
23 files changed, 344 insertions(+), 142 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/contrib/ctools/bulk_export/bulk_export.info
b/sites/all/modules/contrib/ctools/bulk_export/bulk_export.info
index 1e9031d..fd35545 100644
--- a/sites/all/modules/contrib/ctools/bulk_export/bulk_export.info
+++ b/sites/all/modules/contrib/ctools/bulk_export/bulk_export.info
@@ -6,9 +6,9 @@
version = CTOOLS_MODULE_VERSION
-; Information added by Drupal.org packaging script on 2015-01-28
-version = 7.x-1.6
+; Information added by Drupal.org packaging script on 2015-03-18
+version = 7.x-1.7
core = 7.x
project = ctools
-datestamp = 1422471484
+datestamp = 1426696183
diff --git a/sites/all/modules/contrib/ctools/ctools.info
b/sites/all/modules/contrib/ctools/ctools.info
index bd2e3c1..3283454 100644
--- a/sites/all/modules/contrib/ctools/ctools.info
+++ b/sites/all/modules/contrib/ctools/ctools.info
@@ -9,9 +9,9 @@
files[] = includes/stylizer.inc
files[] = tests/css_cache.test
-; Information added by Drupal.org packaging script on 2015-01-28
-version = 7.x-1.6
+; Information added by Drupal.org packaging script on 2015-03-18
+version = 7.x-1.7
core = 7.x
project = ctools
-datestamp = 1422471484
+datestamp = 1426696183
diff --git a/sites/all/modules/contrib/ctools/ctools.module
b/sites/all/modules/contrib/ctools/ctools.module
index c37b96f..3e8cc88 100644
--- a/sites/all/modules/contrib/ctools/ctools.module
+++ b/sites/all/modules/contrib/ctools/ctools.module
@@ -23,7 +23,7 @@
* ; Requires CTools v7.x-1.4 or newer.
* dependencies[] = ctools (=1.4)
*/
-define('CTOOLS_MODULE_VERSION', '7.x-1.6');
+define('CTOOLS_MODULE_VERSION', '7.x-1.7');
/**
* Test the CTools API version.
diff --git
a/sites/all/modules/contrib/ctools/ctools_access_ruleset/ctools_access_ruleset.info
b/sites/all/modules/contrib/ctools/ctools_access_ruleset/ctools_access_ruleset.info
index 2180cec..d7ec175 100644
---
a/sites/all/modules/contrib/ctools/ctools_access_ruleset/ctools_access_ruleset.info
+++
b/sites/all/modules/contrib/ctools/ctools_access_ruleset/ctools_access_ruleset.info
@@ -5,9 +5,9 @@
version = CTOOLS_MODULE_VERSION
dependencies[] = ctools
-; Information added by Drupal.org packaging script on 2015-01-28
-version = 7.x-1.6
+; Information added by Drupal.org packaging script on 2015-03-18
+version = 7.x-1.7
core = 7.x
project = ctools
-datestamp = 1422471484
+datestamp = 1426696183
diff --git
a/sites/all/modules/contrib/ctools/ctools_ajax_sample/ctools_ajax_sample.info
b/sites/all/modules/contrib/ctools/ctools_ajax_sample/ctools_ajax_sample.info
index 009662f..bc1a213 100644
---
a/sites/all/modules/contrib/ctools/ctools_ajax_sample/ctools_ajax_sample.info
+++
b/sites/all/modules/contrib/ctools/ctools_ajax_sample/ctools_ajax_sample.info
@@ -5,9 +5,9 @@
dependencies[] = ctools
core = 7.x
-; Information added by Drupal.org packaging script on 2015-01-28
-version = 7.x-1.6
+; Information added by Drupal.org packaging script on 2015-03-18
+version = 7.x-1.7
core = 7.x
project = ctools
[MediaWiki-commits] [Gerrit] Pre-deploy interface fixes - change (wikimedia...dash)
Ejegg has submitted this change and it was merged.
Change subject: Pre-deploy interface fixes
..
Pre-deploy interface fixes
Need better widget flow for smaller widgets but this is good for now.
Change-Id: I8c0ed19a4f1b455adcf6bd063fcff2839cf92fb7
---
M src/components/boards/generic-board/generic-board.html
M src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
M src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.html
M src/components/widgets/fraud-gauge/fraud-gauge.html
M src/components/widgets/fraud-gauge/fraud-gauge.js
M src/components/widgets/totals-earned-chart/totals-earned-chart.html
M src/components/widgets/x-by-y/x-by-y.html
M src/css/style.css
8 files changed, 272 insertions(+), 293 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/components/boards/generic-board/generic-board.html
b/src/components/boards/generic-board/generic-board.html
index 5484460..80f0fa8 100644
--- a/src/components/boards/generic-board/generic-board.html
+++ b/src/components/boards/generic-board/generic-board.html
@@ -1,6 +1,6 @@
div class=col-md-12
-div class=row row-top
+div class=row
div class=col-md-4 titleCol
h2 style=display:inline data-bind=text:
displayedBoard().displayName/h2
p data-bind=text: displayDate/p
@@ -12,8 +12,10 @@
/div
/div
-div class=row data-bind=foreach: displayedBoard().widgets
-div data-bind=component: { name: widgetCode, params: { title:
displayName, description: description, configuration: configuration,
widgetInstance: id, widgetCode: widgetCode, dataLoading: dataLoading,
sharedContext: $parent.sharedContext } }span data-bind=text:
display_name/span/div
+div class=row widgetDisplayRow data-bind=foreach:
displayedBoard().widgets
+div class=col-md-12 style=padding-left:0
+span class=floatingWidget data-bind=component: { name:
widgetCode, params: { title: displayName, description: description,
configuration: configuration, widgetInstance: id, widgetCode: widgetCode,
dataLoading: dataLoading, sharedContext: $parent.sharedContext } }span
data-bind=text: display_name/span/span
+/div
/div
/div
diff --git
a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
index be07c74..0f64b3a 100644
--- a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
+++ b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
@@ -1,20 +1,23 @@
-div class=col-md-6 lastWidget
- div class=panel panel-purple
- div class=panel-heading
- p class=pull-left data-bind=text:title/p
- div class=btn-group btn-group-xs pull-right
- button type=button class=btn btn-sm
btn-default dropdown-toggle data-toggle=modal data-bind=attr: {
'data-target': '#remove'+instanceID }i class=fa fa-times/i/button
- /div
+
+div class=panel panel-purple widget-6
+ div class=panel-heading
+ p class=pull-left data-bind=text:title/p
+ div class=btn-group btn-group-xs pull-right
+ button type=button class=btn btn-sm btn-default
dropdown-toggle data-toggle=modal data-bind=attr: { 'data-target':
'#remove'+instanceID }i class=fa fa-times/i/button
/div
- div class=panel-body
- p data-bind=visible: !hasData()No data available.
This widget requires a widget like Totals Earned to provide data./p
- div class=col-md-12
- div id=avgUSDperSecond/div
- /div
+ /div
+ div class=panel-body
+ div class=alert alert-warning style=padding:20px
data-bind=visible: !hasData()
+ h3i class=fa fa-2x fa-puzzle-piece/i No data
available./h3
+ This widget works in tandem with another widget, like
emTotals Earned/em. Add the other widget to this board and you'll see the
chart.
+ /div
+ div class=col-md-12
+ div id=avgUSDperSecond/div
/div
/div
/div
+
div class=modal fade data-bind=attr: { id: 'remove'+instanceID }
div class=modal-dialog modal-sm
div class=modal-content
diff --git
a/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.html
b/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.html
index 950b808..096f204 100644
--- a/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.html
+++ b/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.html
@@ -1,22 +1,25 @@
-div class=col-md-6 firstWidget
- div class=panel panel-purple
-
[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (wikimedia...crm)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/199504 Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment d5780cc Update ctools to 7.x-1.7 Change-Id: I1c083ab6e01a2033fd48d466a1f5b7f2453a6de2 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/04/199504/1 -- To view, visit https://gerrit.wikimedia.org/r/199504 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c083ab6e01a2033fd48d466a1f5b7f2453a6de2 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Ejegg eeggles...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Modify c3 style value to work with widgets - change (wikimedia...bower_modules)
Ejegg has submitted this change and it was merged.
Change subject: Modify c3 style value to work with widgets
..
Modify c3 style value to work with widgets
Change-Id: I04a7801024d6400bd3f89c6eee5aca57e4263555
---
M c3/c3.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ejegg: Verified; Looks good to me, approved
diff --git a/c3/c3.js b/c3/c3.js
index 233d1b5..98c4c56 100644
--- a/c3/c3.js
+++ b/c3/c3.js
@@ -877,7 +877,7 @@
.attr('width', $$.width)
.attr('height', $$.height);
// MEMO: parent div's height will be bigger than svg when !DOCTYPE
html
-$$.selectChart.style('max-height', $$.currentHeight + px);
+$$.selectChart.style('max-height',
$$.currentHeight+($$.currentHeight/5) + px);
};
--
To view, visit https://gerrit.wikimedia.org/r/199507
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I04a7801024d6400bd3f89c6eee5aca57e4263555
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/dash/src/bower_modules
Gerrit-Branch: master
Gerrit-Owner: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update bower_modules to include the c3 fix - change (wikimedia...dash)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/199520 Change subject: Update bower_modules to include the c3 fix .. Update bower_modules to include the c3 fix Change-Id: I8bf9bea7a5c41c6aece1f5f28bf9878770d7c11d --- M src/bower_modules 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/20/199520/1 diff --git a/src/bower_modules b/src/bower_modules index b570271..f776d8b 16 --- a/src/bower_modules +++ b/src/bower_modules -Subproject commit b57027165c9375498978d3f65b8324d95621351c +Subproject commit f776d8b7f3152ceccfb02f425985c4612d957643 -- To view, visit https://gerrit.wikimedia.org/r/199520 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8bf9bea7a5c41c6aece1f5f28bf9878770d7c11d Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: master Gerrit-Owner: Ejegg eeggles...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Render settings arc on either button - change (wikimedia...dash)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/199533 Change subject: Render settings arc on either button .. Render settings arc on either button Quick-n-dirty fix Change-Id: Ibc94ac525af04ed68e7ebd0c9150ce4952733465 --- M src/components/widgets/fraud-gauge/fraud-gauge.html 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/33/199533/1 diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.html b/src/components/widgets/fraud-gauge/fraud-gauge.html index 00cf2c2..125e18c 100644 --- a/src/components/widgets/fraud-gauge/fraud-gauge.html +++ b/src/components/widgets/fraud-gauge/fraud-gauge.html @@ -26,7 +26,7 @@ div class=col-md-12 div class=setupAsk h3This widget hasn't been set up yet./h3 -button type=button class=btn btn-primary btn-lg btn-block data-toggle=modal data-target=#modifyModalSet it up/button +button type=button class=btn btn-primary btn-lg btn-block data-toggle=modal data-target=#modifyModal data-bind=click: renderPercentRangeChartSet it up/button /div /div /div -- To view, visit https://gerrit.wikimedia.org/r/199533 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc94ac525af04ed68e7ebd0c9150ce4952733465 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: master Gerrit-Owner: Ejegg eeggles...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (wikimedia...crm)
Ejegg has submitted this change and it was merged. Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment d5780cc Update ctools to 7.x-1.7 Change-Id: I1c083ab6e01a2033fd48d466a1f5b7f2453a6de2 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Ejegg: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/199504 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1c083ab6e01a2033fd48d466a1f5b7f2453a6de2 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add a cat playing a trombone - change (wikimedia...dash)
Ejegg has submitted this change and it was merged.
Change subject: Add a cat playing a trombone
..
Add a cat playing a trombone
Change-Id: I91f62e5ee0d3e2a4e6076c85cf95e624d85fe730
---
M persistence.sql
M src/app/startup.js
A src/components/widgets/cat-trombone/cat-trombone.html
A src/components/widgets/cat-trombone/cat-trombone.js
A src/images/catmusician.gif
5 files changed, 46 insertions(+), 0 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/persistence.sql b/persistence.sql
index d676b56..744b20f 100644
--- a/persistence.sql
+++ b/persistence.sql
@@ -63,6 +63,7 @@
INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'amt-per-second-chart', 'Amount Per Second', 'Shows USD per second
required to reach Big English goal', 'images/amt-per-sec.png');
INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'distance-to-goal-chart', 'Distance to Goal', 'Line chart showing
USD needed to reach overall Big English goal', 'images/distance-to-goal.png');
INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'totals-earned-chart', 'Totals Earned', 'Main Big English bar chart
showing daily and hourly donation totals and counts',
'images/totals-earned.png');
+INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'cat-trombone', 'Trombone Cat', 'A cat is playing a TROMBONE',
'images/catmusician.gif');
/* Tailor these to your liking
GRANT INSERT, SELECT, UPDATE, DELETE ON dash_widget_instance_board TO
'testuser'@'localhost';
diff --git a/src/app/startup.js b/src/app/startup.js
index e6cc743..65f0d20 100644
--- a/src/app/startup.js
+++ b/src/app/startup.js
@@ -25,6 +25,7 @@
ko.components.register( 'distance-to-goal-chart', { require:
'components/widgets/distance-to-goal-chart/distance-to-goal-chart' });
ko.components.register( 'amt-per-second-chart', { require:
'components/widgets/amt-per-second-chart/amt-per-second-chart' });
ko.components.register( 'x-by-y', { require:
'components/widgets/x-by-y/x-by-y' });
+ko.components.register( 'cat-trombone', { require:
'components/widgets/cat-trombone/cat-trombone' });
//fire up router
ko.applyBindings({ route: router.currentRoute });
diff --git a/src/components/widgets/cat-trombone/cat-trombone.html
b/src/components/widgets/cat-trombone/cat-trombone.html
new file mode 100644
index 000..fffac86
--- /dev/null
+++ b/src/components/widgets/cat-trombone/cat-trombone.html
@@ -0,0 +1,31 @@
+
+div class=panel panel-purple widget-6
+ div class=panel-heading
+ p class=pull-leftThis cat is playing a trombone/p
+ div class=btn-group btn-group-xs pull-right
+ button type=button class=btn btn-sm btn-default
dropdown-toggle data-toggle=modal data-bind=attr: { 'data-target':
'#remove'+instanceID }i class=fa fa-times/i/button
+ /div
+ /div
+ div class=panel-body
+ div class=row-fluid
+ div class=col-md-12
+ p class=text-centerimg
src=/images/catmusician.gif/p
+ /div
+ /div
+ /div
+/div
+
+
+div class=modal fade data-bind=attr: { id: 'remove'+instanceID }
+ div class=modal-dialog modal-sm
+ div class=modal-content
+ div class=modal-header
+ h2Remove this widget from the board?/h2
+ /div
+ div class=modal-body
+ button class=btn btn-lg btn-success
pull-right data-dismiss=modal data-bind=click:
$parents[2].removeWidgetFromBoard OK/button
+ button class=btn btn-lg btn-danger
pull-right data-dismiss=modal Cancel/button
+ /div
+ /div!-- /.modal-content --
+ /div
+/div
\ No newline at end of file
diff --git a/src/components/widgets/cat-trombone/cat-trombone.js
b/src/components/widgets/cat-trombone/cat-trombone.js
new file mode 100644
index 000..3a1bf88
--- /dev/null
+++ b/src/components/widgets/cat-trombone/cat-trombone.js
@@ -0,0 +1,13 @@
+define( [
+ 'knockout',
+ 'text!components/widgets/cat-trombone/cat-trombone.html',
+ 'WidgetBase'
+], function( ko, template, WidgetBase ){
+
+ function CatTromboneViewModel( params ){
+
+ WidgetBase.call( this, params );
+
+ }
+ return { viewModel: CatTromboneViewModel, template: template };
+});
diff --git a/src/images/catmusician.gif b/src/images/catmusician.gif
new file mode 100644
index 000..012e511
--- /dev/null
+++ b/src/images/catmusician.gif
Binary files differ
--
To view, visit https://gerrit.wikimedia.org/r/199530
To
[MediaWiki-commits] [Gerrit] WIP: shared filter component - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199266
Change subject: WIP: shared filter component
..
WIP: shared filter component
Add a filters component and a dropdown-filter subcomponent.
Each subcomponent is responsible for creating its own query string.
Change-Id: I9665ba59c4fdf8acf088d5ef6074328e4a975dbc
---
M src/app/startup.js
M src/app/widgetBase.js
A src/components/filters/dropdown-filter/dropdown-filter.html
A src/components/filters/dropdown-filter/dropdown-filter.js
A src/components/filters/filters.html
A src/components/filters/filters.js
M src/components/widgets/x-by-y/x-by-y.html
7 files changed, 120 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/66/199266/1
diff --git a/src/app/startup.js b/src/app/startup.js
index e6cc743..0d0cf6a 100644
--- a/src/app/startup.js
+++ b/src/app/startup.js
@@ -19,6 +19,10 @@
ko.components.register( 'generic-board', { require:
'components/boards/generic-board/generic-board' });
ko.components.register( 'bigEnglishBoard',{ require:
'components/boards/bigEnglish/bigEnglishBoard' });
+ //register filters
+ ko.components.register( 'filters',{
require: 'components/filters/filters' });
+ ko.components.register( 'dropdown-filter',{
require: 'components/filters/dropdown-filter/dropdown-filter' });
+
//register individual widgets
ko.components.register( 'fraud-gauge',{ require:
'components/widgets/fraud-gauge/fraud-gauge' });
ko.components.register( 'totals-earned-chart',{ require:
'components/widgets/totals-earned-chart/totals-earned-chart' });
diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index 4a395d0..c9f9e48 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -28,6 +28,19 @@
self.chartHeight= ko.observable('550');
self.chartLoaded= ko.observable(false);
self.title =
ko.observable(params.title);
+ self.userChoices=
ko.observable(self.config.userChoices);
+ self.filterQueryString =
ko.observable(self.config.filterQueryString || '');
+ self.metadataRequest= ( function() {
+ var storageKey = 'metadata-' + self.widgetCode,
+ data = localStorage.getItem( storageKey );
+
+ if ( data ) {
+ return $.Deferred().resolve( JSON.parse( data )
).promise();
+ }
+ return $.get( 'metadata/' + self.widgetCode, function(
fetchedData ) {
+ localStorage.setItem( storageKey,
JSON.stringify( fetchedData ) );
+ } );
+ } )();
self.getChartData = function( qs ){
self.dataLoading(true);
@@ -42,6 +55,9 @@
};
self.saveWidgetConfig = function(){
+ self.config.userChoices = ko.toJSON( self.userChoices );
+ self.config.filterQueryString = ko.toJSON(
self.filterQueryString );
+
var data = JSON.stringify( {
configuration: self.config,
isShared: false,
@@ -124,14 +140,22 @@
var timeArray = ['Year', 'Month', 'Day', 'Hour'],
index = timeArray.indexOf(
userChoices.timeBreakout ),
- query = 'group=' + userChoices.timeBreakout;
+ query = 'group=' + userChoices.timeBreakout,
+ filterQueryString = self.filterQueryString(),
+ extraFilter;
// If we're grouping by anything finer than year, add a
filter and
// also group by the next level up.
if ( index 0 ) {
query = query + 'group=' + timeArray[index -
1];
- query = query + '$filter=' + timeArray[index -
1] + 'sAgo lt \'1\'';
+ extraFilter = timeArray[index - 1] + 'sAgo lt
\'1\''
+ if ( filterQueryString === '' ) {
+ filterQueryString = '$filter=' +
extraFilter;
+ } else {
+ filterQueryString = filterQueryString +
' AND ' + extraFilter;
+ }
}
+ query = query + '' + filterQueryString;
//groupStr = timeBreakout
[MediaWiki-commits] [Gerrit] Insert a Big English board for each new user - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199560
Change subject: Insert a Big English board for each new user
..
Insert a Big English board for each new user
TODO: make shared boards show up, figure out permissions
Bug: T91581
Change-Id: I41da8460b210f58010fae93ccac9490f32fca4a4
---
M persistence.js
1 file changed, 15 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/60/199560/1
diff --git a/persistence.js b/persistence.js
index fda60f5..d776716 100644
--- a/persistence.js
+++ b/persistence.js
@@ -46,7 +46,20 @@
var params = [ user.id, user.provider, user.displayName ],
insertUser = 'INSERT IGNORE INTO dash_user ( oauth_id,
oauth_provider, display_name ) VALUES ( ?, ?, ? )',
getInfo = 'SELECT id, default_board, avatar, title,
email from dash_user where oauth_id = ? and oauth_provider = ?',
- insertBoard = 'INSERT INTO dash_board ( display_name,
description, owner_id ) VALUES ( ?, \'\', ? ); UPDATE dash_user SET
default_board = LAST_INSERT_ID() WHERE id = ?; SELECT LAST_INSERT_ID() AS id',
+ insertBoard = 'INSERT INTO dash_board ( display_name,
description, owner_id ) VALUES ( ?, \'\', ? );' +
+ 'UPDATE dash_user SET default_board =
LAST_INSERT_ID() WHERE id = ?;' +
+ 'SELECT LAST_INSERT_ID() AS id',
+ insertBigEnglish = 'SET @uid = ?;\n' +
+ 'INSERT INTO dash_board ( display_name,
description, owner_id ) VALUES ( \'Big English\', \'\', @uid );\n' +
+ 'SET @beboard = LAST_INSERT_ID();\n' +
+ 'INSERT INTO dash_widget_instance ( widget_id,
owner_id, display_name, description )\n' +
+ 'SELECT id, @uid, display_name, description
FROM dash_widget WHERE code IN ( \'totals-earned-chart\',
\'distance-to-goal-chart\', \'amt-per-second-chart\' );\n' +
+ 'INSERT INTO dash_widget_instance_board (
instance_id, board_id, widget_position )\n' +
+ 'SELECT dwi.id, @beboard, 1 FROM
dash_widget_instance dwi JOIN dash_widget dw ON dwi.widget_id = dw.id WHERE
owner_id = @uid AND code = \'totals-earned-chart\';\n' +
+ 'INSERT INTO dash_widget_instance_board (
instance_id, board_id, widget_position )\n' +
+ 'SELECT dwi.id, @beboard, 2 FROM
dash_widget_instance dwi JOIN dash_widget dw ON dwi.widget_id = dw.id WHERE
owner_id = @uid AND code = \'distance-to-goal-chart\';\n' +
+ 'INSERT INTO dash_widget_instance_board (
instance_id, board_id, widget_position )\n' +
+ 'SELECT dwi.id, @beboard, 3 FROM
dash_widget_instance dwi JOIN dash_widget dw ON dwi.widget_id = dw.id WHERE
owner_id = @uid AND code = \'amt-per-second-chart\';',
connection = getConnection();
return connection.query( insertUser, params ).then( function() {
@@ -68,6 +81,7 @@
// If user doesn't have a default board, insert
one now
return connection.query( insertBoard, [
'Default dashboard for ' + user.displayName, userId, userId ] ).then( function(
dbResults ) {
user.defaultBoard =
dbResults[0][2][0].id;
+ return connection.query(
insertBigEnglish, [ userId ] );
});
});
});
--
To view, visit https://gerrit.wikimedia.org/r/199560
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I41da8460b210f58010fae93ccac9490f32fca4a4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Save gauge ranges, pull buttons up - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199551
Change subject: Save gauge ranges, pull buttons up
..
Save gauge ranges, pull buttons up
Save and restore custom color ranges on the fraud gauge. Also pull
header buttons up to z-index 10 since they were getting covered by
the graph's -90px top margin.
Change-Id: I5012641b7dbca1973e31260923d74109aaa2edb8
---
M src/components/widgets/fraud-gauge/fraud-gauge.js
M src/css/style.css
2 files changed, 9 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/51/199551/1
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.js
b/src/components/widgets/fraud-gauge/fraud-gauge.js
index 04482a7..c2a8487 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.js
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.js
@@ -50,8 +50,8 @@
self.gaugeValue = ko.observable(0);
self.filtersSelected= ko.observable(false);
self.queryStringSQL = ko.observable('This widget
hasn\'t been set up yet!');
- self.greenHighRange = ko.observable(17);
- self.redLowRange= ko.observable(68);
+ self.greenHighRange = ko.observable(
self.config.greenHighRange || 17 );
+ self.redLowRange= ko.observable(
self.config.redLowRange || 68 );
self.configSet =
ko.observable(Object.keys(self.config).length 0);
self.populateChoices = function(){
@@ -279,7 +279,9 @@
queryString: self.queryString,
timeBreakout:
self.selectedTimePeriod().toString(),
selectedFilters:
self.queryRequest.selectedFilters,
- selectedSubFilters:
self.queryRequest.selectedSubFilters
+ selectedSubFilters:
self.queryRequest.selectedSubFilters,
+ greenHighRange: self.greenHighRange(),
+ redLowRange: self.redLowRange()
};
var chartDataCall = self.getChartData(
self.queryString );
diff --git a/src/css/style.css b/src/css/style.css
index b3e539c..9c9551d 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -457,6 +457,10 @@
padding:5px 5px 0 10px;
}
+.panel-heading button {
+ z-index:10;
+}
+
.panel-purple .panel-heading + .panel-collapse .panel-body {
border-top-color: #5e668a;
}
--
To view, visit https://gerrit.wikimedia.org/r/199551
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5012641b7dbca1973e31260923d74109aaa2edb8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
