admin/cacti
1
0 Fork 0
mirror of https://github.com/Cacti/cacti.git synced 2026-11-08 21:16:17 +09:00
Code Issues Packages Projects Releases Wiki Activity
8,321 Commits 73 Branches 85 Tags
ed57331dfd589610686d7565357c8cf72e89d7d3
Commit Graph
62 Commits
Author SHA1 Message Date
Mark Brugnoli-Vinten 0259c84f48 Feature #1677 - Default Tree node sorting to be inherited (#1678) 
* Feature #1677 - Default Tree node sorting to be inherited

This feature changes the default sorting option to be 'Inherited' when creating new nodes (including root ones) whilst editing a tree. This does not update existing ones to be inherited.

Note: if a DB has already been updated to 1.2, either downgrade and upgrade again or modify the sort_children_type default on the graph_tree_items table to be 0 rather than 1.  Failure to do so will result in manual sorting still being applied do to SQL/PHP assuming that a zero means no value!

* Minor change to update script.
 2018-07-04 11:11:47 -05:00
cigamit 7468ad7d4b Additional reserved work in MySQL 8.x 
The word "locked" is now a reserved word in MySQL 8.x
 2018-06-02 08:55:30 -05:00
cigamit 85e33abdf8 More changes around site branches #122 
Marking this one complete.  Will log a new issue to create Location
branches under site branches.
 2018-05-12 15:37:57 -05:00
cigamit f89ab3b3bc Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x 
# Conflicts:
#	auth_login.php
#	data_sources.php
#	graphs_new.php
#	include/auth.php
#	lib/api_tree.php
#	lib/html_form_template.php
#	lib/html_tree.php
#	lib/template.php
#	permission_denied.php
#	poller_automation.php
#	tree.php
 2018-03-25 11:08:00 -05:00
cigamit ec307ee6f9 Resolving Issue #1493 
Can't create tree branches with '#' sign
 2018-03-24 09:00:46 -05:00
cigamit 4ecc1f0172 Ajust one formatting issue 2018-03-21 17:20:42 -05:00
cigamit 62615311b5 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x 
# Conflicts:
#	docs/CHANGELOG
 2018-01-06 14:08:07 -06:00
Tony Roman 519b35f5cd Update copyright to 2018 2018-01-06 09:10:15 -05:00
Tony Roman 6d1b0a9a76 Merge branch 'develop' into feature/1.2.x 
Conflicts:
	aggregate_graphs.php
	auth_login.php
	automation_templates.php
	cli/add_tree.php
	graph_templates_items.php
	lib/api_automation.php
	lib/api_tree.php
	lib/auth.php
	lib/html_form_template.php
 2017-11-18 09:44:33 -05:00
cigamit 223780bcec Resolving Issue #1012 
Issue where disabled devices do not appear on the tree edit page.
 2017-11-04 19:51:57 -05:00
Tony Roman 6c73dd6105 Merge branch 'develop' into feature/1.2.x 
Conflicts:
	cli/add_tree.php
	docs/CHANGELOG
 2017-10-16 11:36:51 -04:00
Wolfgang Stöggl 4a1a15d72c Correct spelling of RRDtool (#1038) 
- Change RRDTool -> RRDtool with a lowercase t.
- Replace in all files except *.mo, *.po, *.pot
 2017-10-16 11:32:05 -04:00
cigamit 3a8d4f7ff9 Use html_escape() over htmlspecialchars() for consistency and security 2017-09-04 21:26:27 -05:00
cigamit 2c4b143c97 Resolving Issue #122 
- Support Site Branch Type
- Note that though the branches currently render, their form and what is
rendered is still not finalized.
 2017-09-01 14:19:11 -05:00
Tony Roman 8a179d7d7f Fix up to move if elseif else blocks to PSR 2017-05-07 19:57:36 -04:00
Patrick e27a1b65da Small optimisations for threeview 
- fixed several alignment issues

api_tree.php
- api_tree_rename_node() Removed 3 unused methodcalls
- api_tree_item_save() removed unused query
- api_tree_get_branch_ordering() defined fields in query

auth.php:
- defined tablenames for fields

html_tree.php
- draw_dhtml_tree_level_graphing()
  - removed unused parameter
  - moved get_allowed_graphs() call out of the foreach()

graph_view.php
- simplified the $matched queries
- typo in "update_timepsan" => "update_timespan"
 2017-04-26 21:19:26 +02:00
cigamit 5c0d720704 Resolving Issue #303 
The rename activity still shows the ampersand which appears to be a
jstree issue.  Also, it looks like jstree will not accept titles with
things like '<>'
 2017-02-18 11:54:23 -06:00
Tony Roman 35a5988f41 Update source code files copyright to new year 2017-01-01 13:45:29 -05:00
cigamit f9eb5f26ac Use less session variables 
The jstree state plugin will reload the state.  This is one of two
commits to allow deep linking of URL again in Cacti.  Right now deep
linking on the tree is not functioning.  Change root tree icon to tree
icon.
 2016-11-22 18:46:21 -06:00
cigamit b523f1dea5 remove addslashes, prepared statements, wc3 validation, double to single quote 
this is required for preparation of magic_quotes_gpc.
 2016-08-28 15:27:48 -05:00
cigamit fbfc426318 double to single quotes and prepared statements 2016-03-20 10:48:49 -05:00
cigamit 8f11b3c112 more removal of rra_id 2016-03-19 09:52:26 -05:00
cigamit 370c870fca remove rra_id from tree item save function 2016-03-19 09:24:52 -05:00
cigamit 99c6d327ce fix natural sorting 2016-03-09 20:32:45 -06:00
cigamit ab6e18411b sort ordering children when inherit 
make sure tree sorting cascades to children when they inherit their
parent.
 2016-02-20 15:01:06 -06:00
cigamit 2e91e11707 manual sorting not working as expected 2016-02-20 13:07:02 -06:00
cigamit 37ae5fadc6 minor sorting inheritance issue due to vocabulary change 2016-02-20 12:39:02 -06:00
cigamit 63b6d4d6b4 improve logging 
improve logging and remove unneeded includes
 2016-02-19 19:38:26 -06:00
cigamit b97df7121c more tree work 
making a few changes, vocabulary branch to leaf_id, graph_tree_id to
tree_id, prevent a duplicate branch name from being created on any
parent branch, also add function documentation
 2016-02-19 18:33:00 -06:00
cigamit 506dbae9c7 correct tree ordering 
improve sort ordering of trees, support inheritance between tree levels,
don't refresh the entire tree when making small changes.
 2016-02-19 00:44:55 -06:00
Micke2k d188f1631d Change Copyright year 2015 -> 2016 2016-01-29 21:46:02 +04:00
cigamit aa26bda9cb Resolved issue with copy_node 
Copy node would not allow host or graph to be added to two trees at the
same level.
 2015-08-09 17:32:00 -05:00
cigamit 879c0e22ab Revert "Resolve LDAP compatibility with RHEL6" 
This reverts commit 6adcb2d01f.
 2015-08-09 17:23:26 -05:00
cigamit 6adcb2d01f Resolve LDAP compatibility with RHEL6 
ENT_HTML401 not introduced until PHP 5.4
 2015-08-09 17:23:11 -05:00
Jimmy Conner 5bde3da972 1) Update Copyright Years Correct a few minor CY Issues 
2) Allow Locking/UnLocking of Graphs
3) ToolTips
4) Correct Minor Issues with Login/Out/Permission associated with Theme JS
5) Upgrade jQuery which has Fixes for Major issue in Safari 7/8.1

git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7662 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2015-01-04 01:52:50 +00:00
Jimmy Conner dd7f7db308 Fix a few errors in the big patch. 
When you make changes to 1 theme, please make the same changes for all of them.  Need to tweak the colors in Classic theme for main.js still.

git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7653 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2015-01-03 04:49:35 +00:00
Jimmy Conner aead1c8f3f 1) CLog again 
2) Correct some plugin issues related to snmpagent
3) Update modern jQueryUI CSS and images (again)
4) Add autocomplete for device in a few areas add new form object for generic callback
5) Give filter and form objects the jQueryUI styling in modern
6) Convert the Tree edit code to an API
7) Minor CSS changes

git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7651 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2015-01-03 04:20:32 +00:00
Jimmy Conner 4c7200b3c2 1) Fix page refresh on tree 
2) Fix performance issue on initially rendering all trees

git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7646 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2015-01-01 04:43:31 +00:00
Jimmy Conner 63c24d2f1f Add tree changes. So Long Order Key! 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7625 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2014-12-29 15:28:24 +00:00
Jeff Pasnak 6e9f636abf #0002492 - Standardize mysql syntax - final pass 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7621 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2014-12-28 21:09:38 +00:00
Jeff Pasnak fa0e971385 #0002492 - Standardize mysql syntax - start of lib 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7615 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2014-12-26 19:32:18 +00:00
Jimmy Conner ac6d6929cc Remove some unnecessary ending PHP closing tags 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7571 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2014-12-17 03:02:03 +00:00
Tony Roman 65be30ffe0 Update copyright to 2014 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7437 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2014-03-30 19:54:50 +00:00
Tony Roman ce40281901 Update copyright to 2013 for 0.8.8 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7386 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2013-07-21 23:00:42 +00:00
Tony Roman a257958a0b Update copyright to 2012 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@7016 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2012-02-27 07:04:37 +00:00
Larry Adams ac586703e5 QA: Issues with table locking. Fully tested with and without PIA. 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6342 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2011-03-07 14:43:53 +00:00
Larry Adams 78bc0aaed0 -bug#0001956: Attempts to Update Existing Tree Items Fails 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6322 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2011-02-21 03:58:06 +00:00
Larry Adams 8623e55d24 -bug#0001584: Nodes on graph tree are in the wrong places, column order_key has strange values 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6320 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2011-02-21 01:46:21 +00:00
Tony Roman 9acba795fe Update copyright to 2011 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6233 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2011-01-27 03:44:05 +00:00
Larry Adams 262f701a14 QA: Accommodations for PIA 2.9 Support and Autom8 
git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.7@6109 860744bd-22fc-0310-8c96-e9fe5004b5ca
 2010-09-08 03:25:22 +00:00