Skip to content
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.

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

Rename "Internal Error" to "Interrupted" #719

Merged
merged 5 commits into from
Jun 14, 2018

Conversation

swaterkamp
Copy link
Member

No description provided.

@swaterkamp swaterkamp added the work in progress This pull request should not be merged yet, more commits are expected label Jun 11, 2018
@codecov
Copy link

codecov bot commented Jun 11, 2018

Codecov Report

Merging #719 into master will increase coverage by <.01%.
The diff coverage is 5.26%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master    #719      +/-   ##
=========================================
+ Coverage    5.63%   5.64%   +<.01%     
=========================================
  Files         767     767              
  Lines       25271   25300      +29     
  Branches     5697    5714      +17     
=========================================
+ Hits         1425    1428       +3     
- Misses      21428   21454      +26     
  Partials     2418    2418
Impacted Files Coverage Δ
ng/src/web/pages/tasks/icons/resumeicon.js 0% <0%> (ø) ⬆️
ng/src/web/components/bar/statusbar.js 0% <0%> (ø) ⬆️
ng/src/web/pages/reports/row.js 0% <0%> (ø) ⬆️
ng/src/web/pages/tasks/dashboard/statusdisplay.js 0% <0%> (ø) ⬆️
ng/src/web/pages/tasks/status.js 0% <0%> (ø) ⬆️
ng/src/gmp/models/task.js 6% <17.64%> (+2.66%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1b1e5b7...1417edf. Read the comment docs.

Copy link
Contributor

@mattmundell mattmundell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure about the code side, but this is working for me, with gvm PR 126.

@swaterkamp
Copy link
Member Author

So, as long as there are no more requests for this feature, I'll remove the 'work in progress' tag. Feel free to merge :)

@swaterkamp swaterkamp removed the work in progress This pull request should not be merged yet, more commits are expected label Jun 14, 2018
While doing so, also make status and ProgressBar titles translatable.

Having the getTranslatableStatus() method for tasks PLUS the exported
getTranslatableTaskStatus function was "necessary", because having it as
a Task-method is nice, but it is also needed in the StatusBar, where the
status needs translation but the task is not available (just pure status
string).
@bjoernricks bjoernricks merged commit b79638a into greenbone:master Jun 14, 2018
@swaterkamp swaterkamp deleted the TaskInterruptedStatus branch June 14, 2018 08:04
@swaterkamp swaterkamp restored the TaskInterruptedStatus branch June 15, 2018 06:48
@swaterkamp swaterkamp deleted the TaskInterruptedStatus branch November 30, 2018 09:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants