Brett Sun
f92fa972bf
Merge with AD-1255
2015-11-06 15:26:37 +01:00
Brett Sun
56eff0d9ed
Improve DRYness of acl buttons
...
The React dev tools don’t seem to be able to automatically pick up the
displayName when using createClass from within another function, so
it’s added here to give clarity when debugging.
2015-11-06 15:10:29 +01:00
Brett Sun
318a0bf4b2
Filter the collection to only show the consignable items by default
2015-11-06 14:10:54 +01:00
Brett Sun
799ccb9b8d
Show unconsign button
2015-11-06 14:01:26 +01:00
Brett Sun
fb62d2d2e0
Check for completion of additional data on front end
...
In the end, it made more sense to check if all the additional details
have been filled in on the front end than receiving an acl or flag from
the backend.
2015-11-06 14:00:58 +01:00
Brett Sun
04e453b28c
Fix lumenus edition endpoint
2015-11-05 16:05:20 +01:00
Brett Sun
6223248ea0
Fix lumenus whitelabel api endpoints
2015-11-05 13:51:40 +01:00
Brett Sun
4ca8ca8feb
Show AdditionalDetailsModal from SubmitButton when details need to be filled in
2015-11-05 11:58:32 +01:00
Brett Sun
adf0d411d6
Fetch piece data in AdditionalDetailForm
...
Although this moves state further down the hierarchy, it allows the
AdditionalDataForm to be used more easily. Parent components would
otherwise have to have the piece prop carried down through multiple
levels or create a makeshift object.
2015-11-05 11:56:17 +01:00
Brett Sun
3fb4ae55bf
Merge with AD-1290
2015-11-04 14:04:16 +01:00
Brett Sun
2711c4ddb9
Move onChange() to after componentWillUnmount() for ESLint
2015-11-04 13:57:15 +01:00
Brett Sun
543605aae3
Move store resets to componentDidMount()
2015-11-04 13:56:43 +01:00
Brett Sun
85eb45b5cd
Add small changes for previous merges that were missed
2015-11-04 00:41:12 +01:00
Tim Daubenschütz
9a54ebdbd7
Merge pull request #15 from ascribe/AD-1256-refactor-modalwrapper-to-not-be-
...
Refactor ModalWrapper to not require a trigger component
2015-11-03 17:21:11 +01:00
Brett Sun
3929712e9d
Prune unnecessary divs from some components
2015-11-03 12:10:43 +01:00
Brett Sun
54212627bb
Change lumens buttons for AD-1264 changes
2015-11-03 12:10:21 +01:00
Brett Sun
cd6673f255
Merge with AD-1264
2015-11-03 11:34:48 +01:00
Brett Sun
581549870f
Merge with AD-1256
2015-11-03 11:13:44 +01:00
Brett Sun
f7259a8ab3
Merge with AD-1255
2015-11-03 11:13:32 +01:00
Brett Sun
f2555aefcc
Add email prop to loan and consign button
2015-11-03 11:12:04 +01:00
Brett Sun
3a8f91e29e
Change required prop for AD1251 changes
2015-11-03 10:49:06 +01:00
Brett Sun
68c1dd9407
Merge with AD1251
2015-11-03 10:48:28 +01:00
Brett Sun
d2529bf015
Merge with master
2015-11-03 10:39:01 +01:00
Tim Daubenschütz
4d526a5568
Merge pull request #11 from ascribe/AD-1251-refactor-inputtextareatoggables-
...
Refactor InputTextAreaToggable's required property to take a bool instead of a string
2015-11-03 10:25:46 +01:00
Brett Sun
05e3069240
Add propTypes to acl buttons
2015-11-02 18:44:09 +01:00
Brett Sun
fe4e337690
Use Object.assign() instead of writing own merge function
2015-11-02 18:27:45 +01:00
Brett Sun
8540e3de36
Bring over missed changes for cyland for changes to form utils
2015-11-02 15:36:18 +01:00
Brett Sun
a0ebc7dc58
Use string formatting for RequestActionForm's notification message
2015-11-02 15:21:33 +01:00
Brett Sun
fe06ea607f
Remove unnecessary default props
2015-11-02 15:20:02 +01:00
Brett Sun
6c8016e094
Remove misleading editions prop to pieceOrEditions
2015-11-02 15:19:52 +01:00
Brett Sun
49f20462f1
Check for a new csrf token on componentWillReceiveProps instead of componentWillUpdate
...
this.setState() should not be used in componentWillUpdate():
https://facebook.github.io/react/docs/component-specs.html#updating-comp
onentwillupdate
2015-11-02 12:10:41 +01:00
Brett Sun
5f5461c10d
Remove warning for missing prop from FurtherDetailsFileUploader
2015-11-02 10:42:15 +01:00
Brett Sun
a513af984d
Update cyland for FineUploader changes
2015-11-02 10:41:59 +01:00
Brett Sun
d23331d9b9
Remove ReactS3FineUploader's dependency on react-router's location
...
ReactS3FineUploader used to check the current url’s query params to
determine which method it should use to upload, but this decision means
the component is tightly coupled with react-router and history.js. A
major pain point is having to propagate the location prop all the way
down to this component even when it’s not necessary.
Now, ReactS3FineUploader’s parent elements can either parse the current
query params themselves or, if they have a location from react-router,
simply use the location.
Added a few utils to help parse url params.
2015-10-30 17:43:20 +01:00
Brett Sun
67fbfbd470
Update RequestActionForm to use form utils
2015-10-30 11:46:01 +01:00
Brett Sun
5bec3c5dc6
Use const for the cloned trigger element
2015-10-30 11:13:32 +01:00
Brett Sun
03e0bbd024
Separate form building concerns from AclButton
...
AclButton’s form building is now delegated to AclFormFactory so other
components can use the same forms with ease. Its show/hide behaviour is
also now controlled with AclProxy.
2015-10-30 11:10:31 +01:00
Brett Sun
c242cffdbd
Bring over changes for acl_button from Lumenus
2015-10-29 17:04:31 +01:00
Brett Sun
22234492e6
Refactor ModalWrapper to not require a trigger component
2015-10-29 16:23:02 +01:00
Brett Sun
864e0bd2a6
Remove redundant truth check for required prop
2015-10-29 15:45:00 +01:00
Cevo
3cf59ae2af
added public note to piece
2015-10-29 15:31:25 +01:00
Tim Daubenschütz
590818cf0b
Merge pull request #10 from ascribe/cleanup-utility-file-declarations
...
Move code from head_setter.js to dom_utils.js and adjust function-com…
2015-10-29 13:25:15 +01:00
Brett Sun
906ef7c37e
Refactor InputTextAreaToggable's required property to take a bool instead
2015-10-28 19:19:14 +01:00
Brett Sun
784098f225
Fix PropType warnings for components in ascribe_detail
2015-10-28 18:37:09 +01:00
Tim Daubenschütz
66b86209bf
Add appropriate spaces to import statement in header.js
2015-10-28 17:55:44 +01:00
Tim Daubenschütz
ee4c8f624e
Move code from head_setter.js to dom_utils.js and adjust function-comments
2015-10-28 17:45:28 +01:00
Tim Daubenschütz
cc8e455a0e
Merge pull request #8 from ascribe/AD-1233-delete-button-is-way-to-prominent
...
Change delete button back to old styling
2015-10-28 15:56:02 +01:00
Brett Sun
c72a5aa308
Add Lumenus specific data forms to edition and piece details
2015-10-28 11:26:54 +01:00
Tim Daubenschütz
5788e77501
Merge pull request #9 from ascribe/AD-1219-sort-by-and-filter-drop-down-widget-are-cut-off
...
Pull DropdownButtons in collection to the right, to make them work al…
2015-10-27 18:11:00 +01:00
Brett Sun
82b49fc653
Add additional required properties for Lumenus
...
Currently uses the FurtherDetailsFileuploader, just relabeled, to
handle the marketplace image. For now, this allows us to avoid creating
another property in the backend to handle the image, but could be
replaced or modified in the future if we do want to create another
property.
2015-10-27 17:54:35 +01:00
