Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: objectscript/RESTFormsUI-react
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.2
Choose a base ref
...
head repository: objectscript/RESTFormsUI-react
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 1 commit
  • 5 files changed
  • 1 contributor

Commits on Apr 26, 2018

  1. Various fixes

    Update: moment.js dependency
    Fix: object deletion
    Fix: error message for object delition
    ssarkisy committed Apr 26, 2018
    Copy the full SHA
    1c9a315 View commit details
Showing with 2,549 additions and 2,547 deletions.
  1. +2,542 −2,542 package-lock.json
  2. +1 −1 package.json
  3. +1 −1 src/components/App.js
  4. +4 −2 src/components/catalog/CatalogPage.js
  5. +1 −1 src/index.csp
5,084 changes: 2,542 additions & 2,542 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
"antd": "2.13.6",
"axios": "^0.17.0",
"babel-polyfill": "^6.26.0",
"moment": "^2.19.1",
"moment": "^2.22.1",
"prop-types": "^15.6.0",
"react": "15.6.2",
"react-dom": "15.6.2",
2 changes: 1 addition & 1 deletion src/components/App.js
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ class App extends Component {

</Content>
<Footer style={{ textAlign: 'center' }}>
Sergey Sarkisyan ©2017 Built with React and Ant Design
Built with React and Ant Design
</Footer>
</Container>
</Layout>
6 changes: 4 additions & 2 deletions src/components/catalog/CatalogPage.js
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ class CatalogPage extends React.Component {
}

{this.state.catalog.objpermissions.includes('D') &&
<Button type="danger" icon="delete" style={{margin: "0 5px"}}/>
<Button type="danger" id="delete" icon="delete" style={{margin: "0 5px"}}/>
}
</span>
)
@@ -131,8 +131,10 @@ class CatalogPage extends React.Component {
})

.catch((error) => {
const summary = (error && error.response && error.response.data && error.response.data.summary);

notification.error({
message: 'An error has occurred: ' + error.summary
message: 'An error has occurred: ' + summary
});
});
},
2 changes: 1 addition & 1 deletion src/index.csp
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
var initialState = {
config: {
// should be changed to actual path of rest application
server: 'http://localhost:57773/sah/rest'
server: 'http://localhost:57773/api/restforms'
},
};
window.__INITIAL_STATE__ = initialState;