jenkins-bot has submitted this change and it was merged.
Change subject: Add a label for current campaign user is browsing
......................................................................
Add a label for current campaign user is browsing
Change-Id: Ie519c5288fcb142090e3a4add5bb2e206e3a8f2b
---
M data/templates/nav_user.html
M src/App.php
2 files changed, 4 insertions(+), 1 deletion(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/data/templates/nav_user.html b/data/templates/nav_user.html
index 0096223..087a29d 100644
--- a/data/templates/nav_user.html
+++ b/data/templates/nav_user.html
@@ -47,4 +47,4 @@
</li>
</ul>
-
+<label class="navbar-text pull-right">{{ campaignname }}</label>
diff --git a/src/App.php b/src/App.php
index 1bb50c8..02f32fb 100644
--- a/src/App.php
+++ b/src/App.php
@@ -392,6 +392,9 @@
'require-viewcampaign' => function ( $route ) use (
$slim ) {
$user = $slim->authManager->getUserId();
$campaign = $route->getParam('campaign');
+ $campaigninfo =
$slim->campaignsDao->getCampaign( $campaign );
+ $name = $campaigninfo['name'];
+ $slim->view->set( 'campaignname', $name );
if ( $slim->campaignsDao->isReviewer(
$campaign, $user ) === false ) {
// Redirect to home page
$slim->flash( 'error', 'You cannot
access this campaign' );
--
To view, visit https://gerrit.wikimedia.org/r/216540
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie519c5288fcb142090e3a4add5bb2e206e3a8f2b
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/iegreview
Gerrit-Branch: master
Gerrit-Owner: Niharika29 <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
