Aklapper has uploaded a new change for review.

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

Change subject: Also display column name when hiding/showing workboard columns
......................................................................

Also display column name when hiding/showing workboard columns

The query output listed workboard column names only when creating or
renaming columns but not when hiding or showing columns (only the
project name is/was shown).

Also reorder to show project name and column name first.

Change-Id: Id86b4f7dcabe377b0eb0648f6f73f1fe50687ad0
---
M modules/phabricator/templates/project_changes.sh.erb
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/23/317323/1

diff --git a/modules/phabricator/templates/project_changes.sh.erb 
b/modules/phabricator/templates/project_changes.sh.erb
index 265218a..21ecaf2 100644
--- a/modules/phabricator/templates/project_changes.sh.erb
+++ b/modules/phabricator/templates/project_changes.sh.erb
@@ -57,16 +57,18 @@
 #echo "result_column_changes"
 result_column_changes=$(MYSQL_PWD=${sql_pass} /usr/bin/mysql -h $sql_host 
-u$sql_user $sql_name << END
 
-SELECT cltr.oldValue, cltr.newValue, prj.name, usr.userName
+SELECT prj.name AS projectName, cl.name AS columnName, cltr.oldValue, 
cltr.newValue, usr.userName
     FROM phabricator_project.project_columntransaction cltr
     JOIN phabricator_project.project prj
     JOIN phabricator_project.project_column pcl
     JOIN phabricator_user.user usr
-    WHERE (cltr.transactionType = "project:col:name"
+    JOIN phabricator_project.project_column cl
+    WHERE (cltr.transactionType = "project:col:name" 
     OR cltr.transactionType = "project:col:status")
     AND cltr.objectPHID = pcl.phid
     AND pcl.projectPHID = prj.phid
     AND cltr.authorPHID = usr.phid
+    AND cl.phid = cltr.objectPHID
     AND cltr.dateModified > UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL 1 WEEK));
 
 END
@@ -141,6 +143,7 @@
 
 
 PROJECT WORKBOARD COLUMN CHANGES:
+(newValue and oldValue values: 0 = shown, 1 = hidden)
 ${result_column_changes}
 
 

-- 
To view, visit https://gerrit.wikimedia.org/r/317323
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id86b4f7dcabe377b0eb0648f6f73f1fe50687ad0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Aklapper <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to