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.

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

Jump to bottom

admin: Resource settings button is only displayed if there are settings #490

Merged
merged 16 commits into from
May 23, 2024
Merged

admin: Resource settings button is only displayed if there are settings #490

merged 16 commits into from
May 23, 2024

Conversation

T-MaxWiese-T
Copy link
Contributor

@T-MaxWiese-T T-MaxWiese-T commented May 13, 2024 •
edited
Loading

This pull request refers to this feature request (closes #489) about the admin resource where the resource settings button should only be displayed if there are settings.
It was difficult to make this change. It felt like I had to study half the code to get an overview.

@T-MaxWiese-T
admin_main: setVisibilityOfSettingsButton and triggerServerEvent for …
1637e8f 
…resource count added
@T-MaxWiese-T
Query for count of resource settings and trigger for client added
4147907
@T-MaxWiese-T
hasResourceSettings parameter changed and setVisibilityOfSettingsButt…
840ffcd 
…on function moved
@T-MaxWiese-T
Changed root to resourceRoot
7f5a04d
@T-MaxWiese-T
Changed root to resourceRoot
5ed099a
@T-MaxWiese-T
Removed white space
f9eff1d
@T-MaxWiese-T
Moved triggerClientEvent
bda55df
@T-MaxWiese-T
New action “resourcelist” added
95a9882
@T-MaxWiese-T
Changed triggerServerEvent for new action “resoucelist”
d235bcd
@T-MaxWiese-T
Added missing letters to variable
ab7fa01
@T-MaxWiese-T
Changed wrong number of the second argument
c9b1c08
@T-MaxWiese-T
Ignore the first return value of aGetResourceSettings and end moved
bc4b71d
@T-MaxWiese-T
Server event with the “resourcelist” action is only called if a resou…
8e3ffa8 
…rce is selected
@T-MaxWiese-T
Adapted if query of the setVisibilityOfSettingsButton function
9a4cb66
@T-MaxWiese-T
Removed duplicate triggerClientEvent. Added if query that queries the…
33539f2 
… count
@Fernando-A-Rocha
Copy link
Contributor

I think the same change should be made to the new admin2 resource because admin "1" will be discontinued afaik

@T-MaxWiese-T
Copy link
Contributor Author

I think the same change should be made to the new admin2 resource because admin "1" will be discontinued afaik

I assume that you have not tried the latest admin2 resource version. But I have already written the following about the admin2 resource in my issue (#489):

Additional context I have looked at the admin2 resource and there the resource settings are displayed directly, which I think is definitely better.

However, I have considered that instead of an empty grid list if a resource has no settings, it should say “None”, for example, as well as if no description is given, for example.
Because a good GUI gives you information. If the user sees an empty grid list, he might think that there is an error during loading. It is also clearer if only what is needed is displayed.

@Dutchman101
Copy link
Member

Thanks!

@Dutchman101 Dutchman101 merged commit 0224ef5 into multitheftauto:master May 23, 2024
1 check failed
@T-MaxWiese-T T-MaxWiese-T deleted the admin branch June 28, 2024 06:17
T-MaxWiese-T added a commit to T-MaxWiese-T/mtasa-resources that referenced this pull request Jun 28, 2024
@T-MaxWiese-T
admin: Fixed that double clicking on a resource without setting opene…
e8c9a2b 
…d the GUI settings window

This pull request ensures that the GUI settings window is no longer opened if you double-click on a resource name in the resource list and it has no settings.
In this pull request (multitheftauto#490) with the change that the settings button should only be displayed if there are settings, I have not considered this.
@T-MaxWiese-T T-MaxWiese-T mentioned this pull request Jun 28, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

admin: Resource settings button should only be displayed if there are settings
3 participants
@T-MaxWiese-T @Fernando-A-Rocha @Dutchman101