Plan Status: #1031 was successful
Build: #903 was successful
Code Changes
Code has been updated by Ben Zheng <ben.zheng@reyosoft.com>, Andrew Reeves <andrew.reeves@endeavorsystems.com>.
Plan Repository
-
Andrew Reeves <andrew.reeves@endeavorsystems.com> b0e9f7009c26646c300c44b4455c4d913682933a
Merge remote-tracking branch 'origin/ofj1655'
Conflicts:
public/javascripts/Fisma/Calendar-min.js
public/javascripts/combined-min.js
public/javascripts/combined.js
public/javascripts/editable-min.js
public/stylesheets/ie7hacks-min.css -
Ben Zheng <ben.zheng@reyosoft.com> cabd284bbcef3f1107efc59878052a76375ff1a0
OFJ-1655 The ECD date select panel cannot be closed by clicking the X icon when the panel opens twice on finding detail page
Fix defects from OFC-524.
1. Remove validateEcd() function from Finding.js.
2. Remove Fisma.Finding.validateEcd() from Calendar.js
3. Remove 'todo' from mitigation-strategy.ajax.phtml.- application/modules/finding/views/scripts/remediation/mitigation-strategy.ajax.phtml (version cabd284bbcef3f1107efc59878052a76375ff1a0) (diffs)
- public/javascripts/Fisma/Calendar-min.js (version cabd284bbcef3f1107efc59878052a76375ff1a0) (diffs)
- public/javascripts/Fisma/Calendar.js (version cabd284bbcef3f1107efc59878052a76375ff1a0) (diffs)
- public/javascripts/Fisma/Finding-min.js (version cabd284bbcef3f1107efc59878052a76375ff1a0) (diffs)
- public/javascripts/Fisma/Finding.js (version cabd284bbcef3f1107efc59878052a76375ff1a0) (diffs)
- public/javascripts/combined-min.js (version cabd284bbcef3f1107efc59878052a76375ff1a0) (diffs)
- public/javascripts/combined.js (version cabd284bbcef3f1107efc59878052a76375ff1a0) (diffs)
-
Ben Zheng <ben.zheng@reyosoft.com> 4e1671efcc1f831b17797b30ef073f280c95187f
OFJ-1655 The ECD date select panel cannot be closed by clicking the X icon when the panel opens twice on finding detail page
1. Refactoring Calendar.js which gets rid of redundant codes.
2. Move validateEcd from editable.js to Finding.js.
3. Change the code to call addCalendarPopupToTextField() instead of showCalendar() in editable.js.
4. Add codes to ie7hack.css to fix calendar problems.- application/modules/finding/views/scripts/remediation/mitigation-strategy.ajax.phtml (version 4e1671efcc1f831b17797b30ef073f280c95187f) (diffs)
- public/javascripts/Fisma/Calendar-min.js (version 4e1671efcc1f831b17797b30ef073f280c95187f) (diffs)
- public/javascripts/Fisma/Calendar.js (version 4e1671efcc1f831b17797b30ef073f280c95187f) (diffs)
- public/javascripts/Fisma/Finding-min.js (version 4e1671efcc1f831b17797b30ef073f280c95187f) (diffs)
- public/javascripts/Fisma/Finding.js (version 4e1671efcc1f831b17797b30ef073f280c95187f) (diffs)
- public/javascripts/combined-min.js (version 4e1671efcc1f831b17797b30ef073f280c95187f) (diffs)
- public/javascripts/combined.js (version 4e1671efcc1f831b17797b30ef073f280c95187f) (diffs)
- public/javascripts/editable-min.js (version 4e1671efcc1f831b17797b30ef073f280c95187f) (diffs)
- public/javascripts/editable.js (version 4e1671efcc1f831b17797b30ef073f280c95187f) (diffs)
- public/stylesheets/ie7hacks-min.css (version 4e1671efcc1f831b17797b30ef073f280c95187f) (diffs)
- public/stylesheets/ie7hacks.css (version 4e1671efcc1f831b17797b30ef073f280c95187f) (diffs)