[icinga-checkins] icinga.org: icinga-web/jmosshammer/default: * Fixed psql schema and removed typeahead from filters ( #fixes 885 #fixes 872)

git at icinga.org git at icinga.org
Tue Nov 9 11:32:26 CET 2010


Module: icinga-web
Branch: jmosshammer/default
Commit: a22b2f61d6e59608d09c28fa966f4b2106b308c0
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=a22b2f61d6e59608d09c28fa966f4b2106b308c0

Author: root <root at localhost.localdomain>
Date:   Mon Oct 18 10:52:43 2010 +0200

* Fixed psql schema and removed typeahead from filters (#fixes 885 #fixes 872)

---

 app/modules/Cronks/lib/js/FilterHandler.js |    4 ++--
 etc/schema/pgsql.sql                       |   10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/modules/Cronks/lib/js/FilterHandler.js b/app/modules/Cronks/lib/js/FilterHandler.js
index 811802d..3a1b702 100755
--- a/app/modules/Cronks/lib/js/FilterHandler.js
+++ b/app/modules/Cronks/lib/js/FilterHandler.js
@@ -294,8 +294,8 @@ Cronk.FilterHandler = Ext.extend(Ext.util.Observable, {
 
 	getApiCombo : function(meta) {
 		return new Cronk.IcingaApiComboBox({
-			typeAhead: true,
-			triggerAction: 'all',
+			typeAhead: false,
+			triggerAction: 'query',
 			forceSelection: false,
 			'name': meta.name + '-field',
 			'id': meta.name + '-field',
diff --git a/etc/schema/pgsql.sql b/etc/schema/pgsql.sql
index 29ed4e4..ac703f0 100644
--- a/etc/schema/pgsql.sql
+++ b/etc/schema/pgsql.sql
@@ -37,7 +37,7 @@ ALTER TABLE nsm_user_role ADD CONSTRAINT nsm_user_role_usro_role_id_nsm_role_rol
 
 /*          Initial data import              */
  
-INSERT INTO nsm_user (user_id,user_account,user_name,user_firstname,user_lastname,user_password,user_salt,user_authsrc,user_email,user_disabled) VALUES ('1','0','root','Enoch','Root','42bc5093863dce8c150387a5bb7e3061cf3ea67d2cf1779671e1b0f435e953a1','0c099ae4627b144f3a7eaa763ba43b10fd5d1caa8738a98f11bb973bebc52ccd','internal','root at localhost.local','0');
+INSERT INTO nsm_user (user_id,user_account,user_name,user_firstname,user_lastname,user_password,user_salt,user_authsrc,user_email,user_disabled,user_created,user_modified) VALUES ('1','0','root','Enoch','Root','42bc5093863dce8c150387a5bb7e3061cf3ea67d2cf1779671e1b0f435e953a1','0c099ae4627b144f3a7eaa763ba43b10fd5d1caa8738a98f11bb973bebc52ccd','internal','root at localhost.local','0',current_timestamp,current_timestamp);
 INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('1','IcingaHostgroup','Limit data access to specific hostgroups','IcingaDataHostgroupPrincipalTarget','icinga');
 INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('2','IcingaServicegroup','Limit data access to specific servicegroups','IcingaDataServicegroupPrincipalTarget','icinga');
 INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('3','IcingaHostCustomVariablePair','Limit data access to specific custom variables','IcingaDataHostCustomVariablePrincipalTarget','icinga');
@@ -51,10 +51,10 @@ INSERT INTO nsm_target (target_id,target_name,target_description,target_class,ta
 INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('11','appkit.admin','Access to admin panel ','','credential');
 INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('12','appkit.user.dummy','Basic right for users','','credential');
 INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('13','appkit.api.access','Access to web-based api adapter','','credential');
-INSERT INTO nsm_role (role_id,role_name,role_description,role_disabled) VALUES ('1','icinga_user','The default representation of a ICINGA user','0');
-INSERT INTO nsm_role (role_id,role_name,role_description,role_disabled) VALUES ('2','appkit_user','Appkit user test','0');
-INSERT INTO nsm_role (role_id,role_name,role_description,role_disabled,role_parent) VALUES ('3','appkit_admin','AppKit admin','0','2');
-INSERT INTO nsm_role (role_id,role_name,role_description,role_disabled) VALUES ('4','guest','Unauthorized Guest','0');
+INSERT INTO nsm_role (role_id,role_name,role_description,role_disabled,role_created,role_modified) VALUES ('1','icinga_user','The default representation of a ICINGA user','0',current_timestamp,current_timestamp);
+INSERT INTO nsm_role (role_id,role_name,role_description,role_disabled,role_created,role_modified) VALUES ('2','appkit_user','Appkit user test','0',current_timestamp,current_timestamp);
+INSERT INTO nsm_role (role_id,role_name,role_description,role_disabled,role_parent,role_created,role_modified) VALUES ('3','appkit_admin','AppKit admin','0','2',current_timestamp,current_timestamp);
+INSERT INTO nsm_role (role_id,role_name,role_description,role_disabled,role_created,role_modified) VALUES ('4','guest','Unauthorized Guest','0',current_timestamp,current_timestamp);
 INSERT INTO nsm_db_version (vers_id,version) VALUES ('1','2');
 INSERT INTO nsm_user_role (usro_user_id,usro_role_id) VALUES ('1','1');
 INSERT INTO nsm_user_role (usro_user_id,usro_role_id) VALUES ('1','2');





More information about the icinga-checkins mailing list