@sanbornagency/nodebb-theme-quest
Advanced tools
Comparing version 1.4.31 to 1.4.32
@@ -7,1 +7,2 @@ Notes for NodeBB Data Import: | ||
- `connections` column in `users` table is reference to users `id` | ||
- Some groups missing owners, e.g., Greater+Boston+PeopleSoft+and+JD+Edwards+Regional+User+Group |
@@ -50,8 +50,2 @@ 'use strict'; | ||
function (apiResponse, numInvites) { | ||
// // get the largest number divisible by 4 (column count) | ||
// let sliceCount = Math.round(apiResponse.users.length / 4) * 4; | ||
// // if our slice count is larger than our response, i.e., 19, subtract 4 | ||
// let end = (sliceCount > apiResponse.users.length) ? sliceCount - 4 : apiResponse.users.length; | ||
// data.users = apiResponse.users.slice(0, end); | ||
@@ -68,2 +62,7 @@ data.users = apiResponse.users; | ||
if (queryObj.software) { | ||
const activeTab = queryObj.software; | ||
data[activeTab] = true; | ||
} | ||
data.pagination = apiResponse.pagination; | ||
@@ -70,0 +69,0 @@ data.invites = numInvites; |
@@ -175,7 +175,7 @@ 'use strict'; | ||
group.shortDescription = res.shortDescription || ''; | ||
group.jde = (res.jde == 'true'); | ||
group.peoplesoft = (res.peoplesoft == 'true'); | ||
group.oraclecloud = (res.oraclecloud == 'true'); | ||
group.crossproduct = (res.crossproduct == 'true'); | ||
group.regional = (res.regional == 'true'); | ||
group.jde = (res.jde == 'true' || res.jde == true); | ||
group.peoplesoft = (res.peoplesoft == 'true' || res.peoplesoft == true); | ||
group.oraclecloud = (res.oraclecloud == 'true' || res.oraclecloud == true); | ||
group.crossproduct = (res.crossproduct == 'true' || res.crossproduct == true); | ||
group.regional = (res.regional == 'true' || res.regional == true); | ||
group.modifier = res.modifier || ''; | ||
@@ -252,3 +252,4 @@ | ||
crossproduct: crossproduct, | ||
regional: regional | ||
regional: regional, | ||
modifier: modifier | ||
}; | ||
@@ -255,0 +256,0 @@ |
@@ -124,6 +124,6 @@ "use strict"; | ||
updateUserStats: function (uid, updatedStat, updatedAltStat) { | ||
User.getUserFields(uid, ['apiId'], (err, res) => { | ||
User.getUserFields(uid, ['username'], (err, res) => { | ||
if (err) console.log('>>> err getting user apiId', err); | ||
if (res.apiId) { | ||
var url = config.api['url'] + 'users/' + res.apiId; | ||
var url = config.api['url'] + 'users/' + res.username; | ||
var apiId = res.apiId; | ||
@@ -130,0 +130,0 @@ request.get(url, (err, res, body) => { |
{ | ||
"name": "@sanbornagency/nodebb-theme-quest", | ||
"version": "1.4.31", | ||
"version": "1.4.32", | ||
"description": "Custom nodebb theme for quest", | ||
@@ -5,0 +5,0 @@ "main": "theme.less", |
@@ -86,3 +86,5 @@ | ||
current = current[2]; | ||
$('.js-qds-c-sub-nav__item-'+current).addClass('is-active'); | ||
if (current == 'connect' || current == 'groups' || current == 'forums') { | ||
$('.js-qds-c-sub-nav__item-'+current).addClass('is-active'); | ||
} | ||
} else { | ||
@@ -89,0 +91,0 @@ $('.js-qds-c-sub-nav__item-all').addClass('is-active'); |
@@ -164,2 +164,9 @@ "use strict"; | ||
}); | ||
// close group owner pop ups when one of the links is clicked | ||
$(document).on('click', '.qds-c-popover-links__link', function() { | ||
require(['webui-popover'], function() { | ||
WebuiPopovers.hideAll(); | ||
}) | ||
}); | ||
}; | ||
@@ -166,0 +173,0 @@ |
@@ -58,2 +58,13 @@ 'use strict'; | ||
$(window).on('popstate', function(event) { | ||
var state = event.originalEvent.state; | ||
push = true; | ||
if (state) { | ||
window.software = state.software; | ||
$('.js-qds-users-tab a[data-tab="'+ state.software +'"]').click(); | ||
} | ||
}); | ||
$(document).on('click', '.js-qds-users-tab a', function (e) { | ||
@@ -68,2 +79,9 @@ var $this = $(e.currentTarget); | ||
var $loading = $('.js-qds-loading'); | ||
var location; | ||
if (tab == 'recommended') { | ||
location = '/connect'; | ||
} else { | ||
location = (window.location.search.indexOf(tab) > -1) ? window.location.search : '?software=' + tab; | ||
} | ||
@@ -76,5 +94,5 @@ if($this.parent().hasClass('is-active')) { | ||
processing = true; | ||
if(!push) { | ||
history.pushState({}, '', hash); | ||
history.pushState({software: tab}, '', location); | ||
} | ||
@@ -81,0 +99,0 @@ |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
4998278
6565
18