Wayne Witzel III
96cc714489
Update smart inventory acceptance
2017-07-14 10:41:06 -04:00
Matthew Jones
891f26c850
Fix an issue where an unlicensed system would throw errors
...
In the case where the license was entirely not present but the tower
license module was present
2017-07-14 10:21:26 -04:00
Christian Adams
f5bbccf0cd
Merge pull request #6979 from rooftopcellist/IntegrityError
...
Fix IntegrityError on Source Update
2017-07-14 06:45:31 -07:00
adamscmRH
d065d5176e
Removes redundant atomic transactions
2017-07-14 06:41:53 -07:00
Marliana Lara
a8ad5cc2f7
Merge pull request #7036 from marshmalien/fix/styleWideSurveyModal
...
Shrink modal size based on user permissions
2017-07-14 09:24:16 -04:00
Alan Rominger
9f277e8acd
Merge pull request #7068 from AlanCoding/nesting_err
...
fix double nesting of error message in dictionary
2017-07-14 08:52:12 -04:00
AlanCoding
f1acb6b79d
fix double nesting of error message in dictionary
2017-07-14 08:01:57 -04:00
Michael Abashian
ba3c1d3424
Merge pull request #7035 from mabashian/5092-team-permissions
...
Filter credentials based on org when adding team permissions.
2017-07-13 18:38:40 -04:00
Michael Abashian
e8510e2a4d
Merge pull request #7049 from mabashian/6227-logging
...
Disable log enable toggle when required fields not present
2017-07-13 18:38:06 -04:00
Michael Abashian
a574d8b645
Merge pull request #7051 from mabashian/7034-disable-save-no-filter
...
Smart inventory validation bug fix
2017-07-13 18:36:21 -04:00
Michael Abashian
635561390b
Merge pull request #7057 from mabashian/6823-smart-inv-per-page
...
Hide view per page on smart inventory modal
2017-07-13 18:35:51 -04:00
Aaron Tan
e053d2c33a
Merge pull request #7059 from jangsutsr/6624_stablize_summary_field_display_for_host_serializer
...
Stablize summary field display for host serializer
2017-07-13 16:48:17 -04:00
Ryan Petrello
fdbf21a13a
Merge pull request #7063 from ryanpetrello/celery-hang-6534
...
pin celery to a known version that works
2017-07-13 16:35:56 -04:00
Aaron Tan
636147f7f0
Stablize summary field display for host serializer.
2017-07-13 16:30:47 -04:00
Matthew Jones
9cf2343570
Remove fact cache log setup from openshift configmap
...
fact cache receiver doesn't appear to exist anymore
2017-07-13 16:30:24 -04:00
Ryan Petrello
0239cd37fe
pin celery to a known version that works
...
newer celery 3.x seems to a bug which causes forked celery worker
interprocess communication to hang (see: #6534 )
2017-07-13 16:24:30 -04:00
Ryan Petrello
d03cacbb57
Merge pull request #7062 from ryanpetrello/fix-7050
...
properly copy parent roles when migrating v1 SSH creds to SSH + Vault
2017-07-13 16:20:16 -04:00
Ryan Petrello
58abfc3fde
properly copy parent roles when migrating v1 SSH creds to SSH + Vault
...
see: #7050
2017-07-13 15:02:55 -04:00
Wayne Witzel III
8cf3bb3134
Merge pull request #7058 from wwitzel3/host-smart_inventories
...
Update how we repopulate the /host/:id/smart_inventories data
2017-07-13 14:54:30 -04:00
Michael Abashian
484b01c14f
Hide view per page on smart inventory modal
2017-07-13 14:05:12 -04:00
Wayne Witzel III
6f1ef7fe0b
Update how we repopulate the /host/:id/smart_inventories data
2017-07-13 14:04:33 -04:00
adamscmRH
0d0c75c318
Change to update if already exists
2017-07-13 13:55:42 -04:00
Matthew Jones
8e8324983b
Merge branch 'license_module_switch' into devel
...
* license_module_switch:
Hide eula if stub license is used
Fix up some issues on feature validation for licenses
Remove any references to internal licensing utilities
Switch out existing obfuscated license with external module
2017-07-13 11:08:47 -04:00
Matthew Jones
d5346ec6d0
Hide eula if stub license is used
2017-07-13 10:57:56 -04:00
Michael Abashian
3bd214393b
Smart inventory validation bug fix
2017-07-13 10:44:47 -04:00
Matthew Jones
c1ce79d0a5
Fix up some issues on feature validation for licenses
...
Also purging and fixing up some unit test behavior
2017-07-13 10:27:43 -04:00
Michael Abashian
bbf8f2081d
Merge pull request #7023 from mabashian/host-list-empty-text
...
Changed empty host list message
2017-07-13 10:15:26 -04:00
Michael Abashian
48bc16fb1a
Roll back resetValue changes. There's a separate issue for this.
2017-07-13 10:12:57 -04:00
Michael Abashian
5b488a41ec
Moved enable logging toggle out of form and disabled toggle when required fields aren't provided.
2017-07-13 09:59:22 -04:00
Alan Rominger
7c3020eada
Merge pull request #7048 from AlanCoding/fix-7022
...
Act. stream Race condition avoidance with additional adjustments
2017-07-13 09:57:10 -04:00
Ryan Petrello
0b67f2fd9a
Merge pull request #7047 from ryanpetrello/debug-tasks
...
log task failures when DEBUG = True
2017-07-13 09:51:24 -04:00
AlanCoding
0a6329feff
deleted related in activity stream tests/surfacing
...
This adds a test to replicate the scenario reported about
bugs in activity stream entry generation in cascade delete
chains. Also puts a new string in the entry that uses the
deleted objects's primary key.
2017-07-13 09:07:53 -04:00
Ryan Petrello
2d5c021b72
log task failures when DEBUG = True
...
this helps a lot for development - otherwise you have to go look an
explanaton in the database for these sorts of failures
2017-07-13 08:24:42 -04:00
Chris Meyers
2f7a720ba1
Merge pull request #7033 from chrismeyersfsu/fix-3801
...
use newest aws env var names for creds
2017-07-13 08:09:24 -04:00
Chris Meyers
4b9385a233
Merge pull request #7031 from chrismeyersfsu/fix-6342
...
disallow new survey spec with password default $encrypted$
2017-07-13 08:07:30 -04:00
Chris Meyers
352e83aa84
fix diff_mode migration error
2017-07-13 07:54:58 -04:00
adamscmRH
5a307dd62b
Added defaults to get_or_create methods
2017-07-12 22:40:34 -04:00
Alan Rominger
506209baae
Merge pull request #7037 from AlanCoding/6535_2
...
Mark inventory source creation views as added 3.2
2017-07-12 19:49:42 -04:00
Jared Tabor
9f605b2dba
Merge pull request #7041 from gconsidine/ui/add-string-override-support
...
Ui/add string override support
2017-07-12 14:34:59 -07:00
gconsidine
9b22df228f
Refactor to use get method to access strings vs direct
2017-07-12 17:00:26 -04:00
Ryan Petrello
80224b791d
avoid a race condition in recording deletions in the activity stream
...
1. You delete something.
2. A signal is generated to record an activity stream deletion.
3. The process of deleting that activity stream deletion attempts to
look up a related field which has been deleted (in the meantime) via
a cascade.
see: #6721
see: #7022
2017-07-12 16:39:39 -04:00
Matthew Jones
96a9d048b8
Remove any references to internal licensing utilities
2017-07-12 16:20:35 -04:00
Marliana Lara
3c626739c3
Shrink modal size based on user permissions
2017-07-12 15:49:10 -04:00
gconsidine
594c4d6ce2
Add support for configurably including strings
...
* Add json-loader to load JSON files via webpack
* Add a JSON file for string overrides
* Add a getter method to BaseString for an easier and more clearly
defined approach to accessing string values
2017-07-12 15:40:14 -04:00
Michael Abashian
beeb9b8c01
Hide organizations tab when adding team permissions. Filter credentials based on org when adding team permissions.
2017-07-12 15:35:50 -04:00
Marliana Lara
c5d1ff1791
Merge pull request #7032 from marshmalien/fix/monacoFontFamilyFallbacks
...
Add font-family fallbacks for revision sha
2017-07-12 15:28:51 -04:00
Chris Meyers
6511d2968e
use newest aws env var names for creds
2017-07-12 15:27:18 -04:00
AlanCoding
45d9b670fd
mark inventory source creation views as added 3.2
2017-07-12 15:25:19 -04:00
Chris Meyers
d3e4be66dd
disallow new survey spec with password default $encrypted$
2017-07-12 15:21:55 -04:00
Marliana Lara
8e1e58c2db
Add font-family fallbacks for revision sha
2017-07-12 15:13:47 -04:00
