Skip to content

Feature/misc changes #1138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vikasrohit merged 4 commits into from
Aug 23, 2017
Merged

Feature/misc changes #1138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b476f67
Github issue#1134, Update copyright year on spec footer
Aug 23, 2017
d05c08e
Merge branch 'dev' into feature/misc-changes
Aug 23, 2017
6d4ecea
Github issue#1133, Chatbot: "Save changes" button is enabled, but not…
Aug 23, 2017
d2e3893
fixed lint error
Aug 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/FooterV2/FooterV2.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const FooterV2 = () => (
<li><a href="https://connect.topcoder.com/terms">Terms</a></li>
</ul>
<div className="footer-copyright">
Topcoder © { moment().format('YYYY') }.
© Topcoder { moment().format('YYYY') }
</div>
</div>
)
Expand Down
22 changes: 18 additions & 4 deletions src/reducers/alerts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
CREATE_PROJECT_SUCCESS, CREATE_PROJECT_FAILURE,
UPDATE_PROJECT_SUCCESS, UPDATE_PROJECT_FAILURE,
DELETE_PROJECT_SUCCESS, DELETE_PROJECT_FAILURE,
LOAD_PROJECT_SUCCESS,
// Attachments
ADD_PROJECT_ATTACHMENT_SUCCESS, ADD_PROJECT_ATTACHMENT_FAILURE,
UPDATE_PROJECT_ATTACHMENT_SUCCESS, UPDATE_PROJECT_ATTACHMENT_FAILURE,
Expand All @@ -20,7 +21,9 @@ import {
SAVE_PROJECT_FEED_FAILURE,
SAVE_PROJECT_FEED_COMMENT_FAILURE,
DELETE_PROJECT_FEED_FAILURE,
DELETE_PROJECT_FEED_COMMENT_FAILURE
DELETE_PROJECT_FEED_COMMENT_FAILURE,
// Project status
PROJECT_STATUS_IN_REVIEW
} from '../config/constants'
/* eslint-enable no-unused-vars */

Expand All @@ -36,13 +39,24 @@ export default function(state = {}, action) {
Alert.success('Project deleted.')
return state

case UPDATE_PROJECT_SUCCESS:
if (action.payload.status === 'in_review') {
case LOAD_PROJECT_SUCCESS:
return Object.assign({}, state, {
project: action.payload
})

case UPDATE_PROJECT_SUCCESS: {
const prevStatus = _.get(state, 'project.status', '')
if (action.payload.status === PROJECT_STATUS_IN_REVIEW
&& prevStatus && prevStatus !== PROJECT_STATUS_IN_REVIEW) {
Alert.success('Project submitted.')
} else {
Alert.success('Project updated.')
}
return state
return Object.assign({}, state, {
project: action.payload
})
}

case REMOVE_PROJECT_MEMBER_SUCCESS:
// show notification message if user leaving a project
if (action.meta.isUserLeaving) {
Expand Down