1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-14 10:16:26 +00:00

Merge branch 'dev'

* dev:
  実装 - MemberがOwnerではないときにTeam設定ボターンを全部隠す
  v0.2.4 - Minor fix
  fix minor bug
This commit is contained in:
Rokt33r
2015-08-24 06:22:32 +09:00
3 changed files with 13 additions and 2 deletions

View File

@@ -223,7 +223,9 @@ module.exports = React.createClass({
renderTeamHome: function (currentUser) { renderTeamHome: function (currentUser) {
var user = this.state.user var user = this.state.user
var isOwner = true var isOwner = user.Members == null ? false : user.Members.some(function (member) {
return member.id === currentUser.id && member.TeamMember.role === 'owner'
})
var userPlanets = user.Planets.map(function (planet) { var userPlanets = user.Planets.map(function (planet) {
return ( return (
@@ -257,7 +259,7 @@ module.exports = React.createClass({
<div className='userName'>{user.name}</div> <div className='userName'>{user.name}</div>
</div> </div>
<button onClick={this.openTeamSettingsModal} className='editProfileButton'>Team settings</button> {isOwner ? (<button onClick={this.openTeamSettingsModal} className='editProfileButton'>Team settings</button>) : null}
</div> </div>
<div className='memberList'> <div className='memberList'>
<div className='memberLabel'>{members.length} {members.length > 1 ? 'Members' : 'Member'}</div> <div className='memberLabel'>{members.length} {members.length > 1 ? 'Members' : 'Member'}</div>

View File

@@ -1,4 +1,5 @@
function deleteItemFromTargetArray (item, targetArray) { function deleteItemFromTargetArray (item, targetArray) {
if (targetArray == null) targetArray = []
targetArray.some(function (_item, index) { targetArray.some(function (_item, index) {
if (_item.id === item.id) { if (_item.id === item.id) {
targetArray.splice(index, 1) targetArray.splice(index, 1)
@@ -11,6 +12,8 @@ function deleteItemFromTargetArray (item, targetArray) {
} }
function updateItemToTargetArray (item, targetArray) { function updateItemToTargetArray (item, targetArray) {
if (targetArray == null) targetArray = []
var isNew = !targetArray.some(function (_item, index) { var isNew = !targetArray.some(function (_item, index) {
if (_item.id === item.id) { if (_item.id === item.id) {
targetArray.splice(index, 1, item) targetArray.splice(index, 1, item)

View File

@@ -35,6 +35,9 @@ module.exports = {
fetchUser: function (userName) { fetchUser: function (userName) {
return request return request
.get(apiUrl + 'resources/' + userName) .get(apiUrl + 'resources/' + userName)
.set({
Authorization: 'Bearer ' + localStorage.getItem('token')
})
}, },
updateUser: function (userName, input) { updateUser: function (userName, input) {
return request return request
@@ -79,6 +82,9 @@ module.exports = {
fetchPlanet: function (userName, planetName) { fetchPlanet: function (userName, planetName) {
return request return request
.get(apiUrl + 'resources/' + userName + '/planets/' + planetName) .get(apiUrl + 'resources/' + userName + '/planets/' + planetName)
.set({
Authorization: 'Bearer ' + localStorage.getItem('token')
})
}, },
updatePlanet: function (userName, planetName, input) { updatePlanet: function (userName, planetName, input) {
return request return request