dandds 
							
						 
					 
					
						
						
							
						
						457b1f9523 
					 
					
						
						
							
							Detangle the MultiStepModalForm modal-open link from the modal.  
						
						 
						
						... 
						
						
						
						In order to place modal forms in other places on the page (so that forms
are not nested) it's necessary to move MultiStepModalForm links out of
the component. They just need to refer to the correct modal.
This PR also makes changes to ensure that the active modal is being
unset everywhere correctly when a modal is closed. 
						
						
					 
					
						2019-05-08 11:16:56 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dandds 
							
						 
					 
					
						
						
							
						
						f52f2a9ade 
					 
					
						
						
							
							Merge pull request  #810  from dod-ccpo/empty-state-app-member  
						
						 
						
						... 
						
						
						
						Add new application members to an empty application. 
						
						
					 
					
						2019-05-07 16:54:44 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dandds 
							
						 
					 
					
						
						
							
						
						f974dab330 
					 
					
						
						
							
							Add new application members to an empty application.  
						
						 
						
						... 
						
						
						
						The link button to add a new application member to an app that did not
have any ("empty state")  was not wired up. This:
- Moves the two steps of the new member modal into macros so that they
  can be reused with different button/link types
- Wires the "invite a new team member" button on the application team
  page
- Makes a minor CSS tweak so that icons nested under `.empty-state` in
  the modal aren't enormous 
						
						
					 
					
						2019-05-07 16:47:45 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								montana-mil 
							
						 
					 
					
						
						
							
						
						fb7efc6057 
					 
					
						
						
							
							Merge pull request  #801  from dod-ccpo/app-team-permissions  
						
						 
						
						... 
						
						
						
						Application Team Table Permissions 
						
						
					 
					
						2019-05-07 16:27:23 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Montana 
							
						 
					 
					
						
						
							
						
						644acc68fa 
					 
					
						
						
							
							Refactor application team routes  
						
						 
						
						... 
						
						
						
						- pulling out helper functions for constructing forms
- return 400 for form validation errors
- "Yes" appears green on the read only version 
						
						
					 
					
						2019-05-07 16:21:17 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Montana 
							
						 
					 
					
						
						
							
						
						d5307b440f 
					 
					
						
						
							
							Make user_id required and add post tests  
						
						 
						
						... 
						
						
						
						- raise an exception in ApplicationRoles.get()
- permission_sets is not changed if bad data is sent 
						
						
					 
					
						2019-05-07 16:21:17 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rachel-dtr 
							
						 
					 
					
						
						
							
						
						298681598b 
					 
					
						
						
							
							Merge pull request  #807  from dod-ccpo/content-cleanup  
						
						 
						
						... 
						
						
						
						Cleaning up content 
						
						
					 
					
						2019-05-07 11:00:22 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						d9ed8ed2f1 
					 
					
						
						
							
							Merge pull request  #806  from dod-ccpo/delete-environment  
						
						 
						
						... 
						
						
						
						Delete environments from an application 
						
						
					 
					
						2019-05-07 10:18:32 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Montana 
							
						 
					 
					
						
						
							
						
						09c0bed47d 
					 
					
						
						
							
							Move edit form outside of the for loop  
						
						 
						
						
						
						
					 
					
						2019-05-07 09:37:53 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Montana 
							
						 
					 
					
						
						
							
						
						2a9de4f3b9 
					 
					
						
						
							
							Match the orders of the permissions everywhere  
						
						 
						
						
						
						
					 
					
						2019-05-07 09:35:38 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Montana 
							
						 
					 
					
						
						
							
						
						1a2051b2bf 
					 
					
						
						
							
							Don't store empty strings as perm values  
						
						 
						
						
						
						
					 
					
						2019-05-07 09:33:42 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Montana 
							
						 
					 
					
						
						
							
						
						526bcb1661 
					 
					
						
						
							
							Update tests  
						
						 
						
						
						
						
					 
					
						2019-05-07 09:31:04 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dandds 
							
						 
					 
					
						
						
							
						
						3c1f4ac6df 
					 
					
						
						
							
							Standardize token argument in routes.  
						
						 
						
						... 
						
						
						
						- `token` becomes `portfolio_token` in routes.
- Find relevant portfolio from token in `before_request` hook, like
  other routes. 
						
						
					 
					
						2019-05-06 16:35:33 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dandds 
							
						 
					 
					
						
						
							
						
						42b912d4cb 
					 
					
						
						
							
							Look up major database resources in a before_request hook.  
						
						 
						
						... 
						
						
						
						A `before_request` hook queries the database for portfolios, requests,
and task orders based on the route arguments. The resources are added as
attributes on `g`. The portfolio context processor and the access
decorator now rely on those resources being available on `g`.
WIP: find major resources in before_request hook, apply to g
WIP: use g.portfolio for portfolio context processor
WIP: the access decorator should rely on the resources being available on g 
						
						
					 
					
						2019-05-06 16:32:55 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rachel-dtr 
							
						 
					 
					
						
						
							
						
						dbdaf376a0 
					 
					
						
						
							
							Cleaning up content  
						
						 
						
						
						
						
					 
					
						2019-05-06 15:22:17 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						f314e9238d 
					 
					
						
						
							
							Fix button copy  
						
						 
						
						
						
						
					 
					
						2019-05-06 15:21:27 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						ef23b1d776 
					 
					
						
						
							
							Move to a component  
						
						 
						
						
						
						
					 
					
						2019-05-06 15:18:53 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Montana 
							
						 
					 
					
						
						
							
						
						1759732d38 
					 
					
						
						
							
							Add success banner  
						
						 
						
						... 
						
						
						
						- The banner does not display which members were updated 
						
						
					 
					
						2019-05-06 15:17:48 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Montana 
							
						 
					 
					
						
						
							
						
						9f266ea4e4 
					 
					
						
						
							
							Update user permission sets  
						
						 
						
						... 
						
						
						
						- adds two domain functions for application roles 
						
						
					 
					
						2019-05-06 15:17:47 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Montana 
							
						 
					 
					
						
						
							
						
						de41afa935 
					 
					
						
						
							
							Add form to template  
						
						 
						
						... 
						
						
						
						- do not use None as a dropdown value because it was causing issues
- cleans up some comments 
						
						
					 
					
						2019-05-06 15:16:48 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Montana 
							
						 
					 
					
						
						
							
						
						416ea1de82 
					 
					
						
						
							
							Watch for changes on the options input, which is a grandchild of base-form  
						
						 
						
						
						
						
					 
					
						2019-05-06 15:16:48 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Montana 
							
						 
					 
					
						
						
							
						
						5692088837 
					 
					
						
						
							
							Add Save Button to edit version of team table  
						
						 
						
						... 
						
						
						
						-adds base form component
-Save button does not function properly yet
-alphabetizes imports on base-form 
						
						
					 
					
						2019-05-06 15:15:03 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Montana 
							
						 
					 
					
						
						
							
						
						c1ae5129bc 
					 
					
						
						
							
							Add edit template with dropdown selectors  
						
						 
						
						
						
						
					 
					
						2019-05-06 15:15:03 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dandds 
							
						 
					 
					
						
						
							
						
						0da0f6a0ae 
					 
					
						
						
							
							WIP: use team form for application team page  
						
						 
						
						
						
						
					 
					
						2019-05-06 15:15:03 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dandds 
							
						 
					 
					
						
						
							
						
						926f89d975 
					 
					
						
						
							
							Form for application team member table.  
						
						 
						
						... 
						
						
						
						Nested form for each member, with child forms for environment roles and
permissions. 
						
						
					 
					
						2019-05-06 15:15:03 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						c3e4f2c6fe 
					 
					
						
						
							
							Move to component  
						
						 
						
						
						
						
					 
					
						2019-05-06 14:33:06 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dandds 
							
						 
					 
					
						
						
							
						
						b0600a34db 
					 
					
						
						
							
							Merge pull request  #802  from dod-ccpo/accept-application-invite  
						
						 
						
						... 
						
						
						
						Accept application invite 
						
						
					 
					
						2019-05-06 14:30:54 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						4fe42ceebb 
					 
					
						
						
							
							Correct modal ID  
						
						 
						
						
						
						
					 
					
						2019-05-06 14:18:09 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						c1acdd81c9 
					 
					
						
						
							
							Fix message  
						
						 
						
						
						
						
					 
					
						2019-05-06 14:12:59 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						44978248d4 
					 
					
						
						
							
							Merge pull request  #803  from dod-ccpo/edit-environment-save-fail-refactor  
						
						 
						
						... 
						
						
						
						Edit environment save fail refactor 
						
						
					 
					
						2019-05-06 13:54:30 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						037fe09163 
					 
					
						
						
							
							Delete environments from an application  
						
						 
						
						
						
						
					 
					
						2019-05-06 13:51:57 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rachel-dtr 
							
						 
					 
					
						
						
							
						
						7245be0550 
					 
					
						
						
							
							Merge pull request  #805  from dod-ccpo/tob-content  
						
						 
						
						... 
						
						
						
						Updating Task Order Builder content through Funding 
						
						
					 
					
						2019-05-06 13:10:01 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rachel-dtr 
							
						 
					 
					
						
						
							
						
						8c34146c0b 
					 
					
						
						
							
							Updating content up through Funding page  
						
						 
						
						
						
						
					 
					
						2019-05-06 11:16:11 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dandds 
							
						 
					 
					
						
						
							
						
						fa2f7f29f3 
					 
					
						
						
							
							Do not scope environment access on applications.  
						
						 
						
						... 
						
						
						
						Application users can see all environments on an application. Limiting
access to the CSP console for an an environment should be handled
differently. 
						
						
					 
					
						2019-05-03 17:11:57 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dandds 
							
						 
					 
					
						
						
							
						
						59a02572ea 
					 
					
						
						
							
							Application users should have access to portfolio landing page.  
						
						 
						
						... 
						
						
						
						- Adds override to portfolio landing page access check to see if user
  has access to any applications within the portfolio.
- Route for accepting an application invitation redirects directly to
  portfolio applications route.
- Tests ensure application user only sees apps the user has access to on
  the portfolio landing page. 
						
						
					 
					
						2019-05-03 17:11:57 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dandds 
							
						 
					 
					
						
						
							
						
						8bd945d0d4 
					 
					
						
						
							
							Applications.for_user returns user's portfolio applications.  
						
						 
						
						... 
						
						
						
						The method has been updated to that, given a user and portfolio, it
returns the portfolio applications for which the user has an application
role. 
						
						
					 
					
						2019-05-03 17:11:57 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dandds 
							
						 
					 
					
						
						
							
						
						a2ebdf78a0 
					 
					
						
						
							
							Route for accepting an application invitation.  
						
						 
						
						... 
						
						
						
						- Domain method for enabling an application role.
- Updated ApplicationRole model `history` property so that it serializes
  the `status` correctly 
						
						
					 
					
						2019-05-03 17:11:57 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						d8771accca 
					 
					
						
						
							
							Merge pull request  #804  from dod-ccpo/unassigned-ppoc  
						
						 
						
						... 
						
						
						
						Unassigned ppoc 
						
						
					 
					
						2019-05-03 15:04:42 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						0e3217d3ac 
					 
					
						
						
							
							Disable SaveButton if form is invalid  
						
						 
						
						
						
						
					 
					
						2019-05-03 14:53:02 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						334f3d8ed3 
					 
					
						
						
							
							Move js to form component  
						
						 
						
						
						
						
					 
					
						2019-05-03 14:48:27 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						094550f99c 
					 
					
						
						
							
							Our invalid forms are blocked via JS now  
						
						 
						
						
						
						
					 
					
						2019-05-03 14:23:47 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						645c217fbe 
					 
					
						
						
							
							Prevent submitting the form if invalid  
						
						 
						
						
						
						
					 
					
						2019-05-03 14:23:47 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						430a6493f0 
					 
					
						
						
							
							Get error state in edit environment name form working  
						
						 
						
						
						
						
					 
					
						2019-05-03 14:23:47 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						2f75d3b245 
					 
					
						
						
							
							Merge pull request  #800  from dod-ccpo/prettier-scss  
						
						 
						
						... 
						
						
						
						Replace sass-convert with prettier 
						
						
					 
					
						2019-05-03 14:04:51 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						9e4647254f 
					 
					
						
						
							
							Run script/format with prettier  
						
						 
						
						
						
						
					 
					
						2019-05-03 14:01:24 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						0996f254cb 
					 
					
						
						
							
							Use prettier rather than sass-convert  
						
						 
						
						
						
						
					 
					
						2019-05-03 14:01:08 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dandds 
							
						 
					 
					
						
						
							
						
						6d31e09716 
					 
					
						
						
							
							Merge pull request  #797  from dod-ccpo/moar-style-updates  
						
						 
						
						... 
						
						
						
						Moar style updates 
						
						
					 
					
						2019-05-03 13:57:39 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						360dab0a32 
					 
					
						
						
							
							Add in check for removing the PPoC  
						
						 
						
						
						
						
					 
					
						2019-05-03 13:51:53 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						f003baad7c 
					 
					
						
						
							
							Failing test  
						
						 
						
						
						
						
					 
					
						2019-05-03 13:46:46 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dandds 
							
						 
					 
					
						
						
							
						
						4289554e76 
					 
					
						
						
							
							Style and formatting updates to environments and team tables.  
						
						 
						
						... 
						
						
						
						- Use the built-in grid system for columns.
- Add column heads to environments table.
- Add delete icon to environments table. 
						
						
					 
					
						2019-05-03 12:44:05 -04:00