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

Enable sensitive graph information to be hidden from standard users #4049

Merged
merged 17 commits into from Jan 17, 2021
Merged

Enable sensitive graph information to be hidden from standard users #4049

merged 17 commits into from Jan 17, 2021

Conversation

MarcBanyard
Copy link
Contributor

The List View screen is showing sensitive information to users who only have access to view graphs.
image

This commit removes the Device, Source Type and Source Name columns to anyone who does not have the Graph Templates permission so the screen now looks like this to users who do not have the permission to edit templates.
image

A new option in the user account has been added to show the User Community and Documentation links from the user menu.
image

To show them navigate to Configuration > Users
Select the required user and click the Permissions Tab
Under the Normal User section you will see a Show User Help Links option enable this to see the User Community and Documentation links from the user menu.
image

MarcBanyard and others added 13 commits October 9, 2020 19:14
Make it more obvious that a slider is disabled.
Make it more obvious that a radio slider is disabled.
Fixed the default value for the 30 second polling and amended the default values for the 1 minute polling for new installs
Bringing for up to date
… and graph.php pages

The icons are on the right hand side of the graphs and the default behaviour is to display them unless you hide them per user in the permissions tab
@TheWitness
Copy link
Member

First off, we are reversing the permission on the graph drill-downs. So, the default will be to deny access, and then when you check the checkbox, the drill-downs will be permitted. So, please preserve the 1.2.x code which has already made that change.

@MarcBanyard
Copy link
Contributor Author

MarcBanyard commented Jan 11, 2021

We have, i am not sure why all of the other commits are showing in this pull request.
The 2nd from the bottom is the merge from the main 1.2.x being merged into my clone on here (b5b1bb6) as there were conflicts that needed to be resolved and it required a special commit (this may be why all of the other commits are showing above it).
The bottom one is the actual changes that are being requested to merge from my fork into the main 1.2.x branch.

I have just done a pull from my fork and compared it to the main 1.2.x branch with WinMerge and the only difference is the changes in the last commit which are the include\global_arrays.php, lib\functions.php and graph_view.php files.

@MarcBanyard
Copy link
Contributor Author

Just removed the duplicate line from the CHANGELOG file so the only files that have changed from this commit are the include\global_arrays.php, lib\functions.php and graph_view.php files.

@MarcBanyard
Copy link
Contributor Author

Just realised that I still had the old text in the screen snip above which is what probably caused the confusion.

The screen actually looks like
image

include/global_arrays.php Show resolved Hide resolved
include/global_arrays.php Show resolved Hide resolved
lib/functions.php Show resolved Hide resolved
graph_view.php Show resolved Hide resolved
@TheWitness
Copy link
Member

@datatecuk, all we are missing from my perspective is a CHANGELOG entry. Do you have time to do this today?

@MarcBanyard
Copy link
Contributor Author

@TheWitness I have just pushed this for you now.

@TheWitness
Copy link
Member

Glad you did that. Could you do one more thing? Run the following script, and then add cacti.pot to the pull request

cd /var/www/html/cacti/locales
./build_gettext.sh

@TheWitness
Copy link
Member

@datatecuk, I hope you saw the lastest request.

@MarcBanyard
Copy link
Contributor Author

Is it just that single file you want as all files in the /var/www/html/cacti/locales/LC_MESSAGES and /var/www/html/cacti/locales/po have changed after running the ./build_gettext.sh script.

@TheWitness
Copy link
Member

Just the single file. Per our new documentation on pull requests, you should only include the cacti.pot in pull requests. The rest of the language changes take place at https://translate.cacti.net.

@TheWitness TheWitness merged commit 234f90c into Cacti:1.2.x Jan 17, 2021
@netniV netniV changed the title Only show sensitive graph information to Template Editors in the List View screen Enable sensitive graph information to be hidden from standard users Apr 12, 2021
@github-actions github-actions bot locked and limited conversation to collaborators Jul 12, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants