Revision 66 hci/trunk/eneraptor-web-app/grails-app/controllers/com/eneraptor/hci/SysLogController.groovy

View differences:

SysLogController.groovy
41 41
		flash['warnings'] = null
42 42
		
43 43
		List devicesForCheckBox = new ArrayList()
44
		DeviceInfo.findAllByInputDeviceOrOutputDevice(true,true).each {
45
			devicesForCheckBox << it
44
		
45
		def crit1 = DeviceInfo.createCriteria()
46
		devicesForCheckBox = crit1 {
47
			and {
48
				or {
49
					eq("outputDevice",true)
50
					eq("inputDevice",true)
51
				}
52
				eq("hwSet",session.hwSet)
53
			}
54
			order("friendlyName","asc")
46 55
		}
47 56
		
48 57
		def entries = new ArrayList()
......
132 141
		List devices = new ArrayList()
133 142
		List data = new ArrayList()
134 143
		
135
		DeviceInfo.findAllByInputDevice(true).each {
136
			devices << it
144
		def crit1 = DeviceInfo.createCriteria()
145
		devices = crit1 {
146
			and {
147
				eq("inputDevice",true)
148
				eq("hwSet",session.hwSet)
149
			}
150
			order("friendlyName","asc")
137 151
		}
138 152
		
139 153
		if(params['dataList'])
......
162 176
	def export = {
163 177
		
164 178
		List devicesForCheckBox = new ArrayList()
165
		DeviceInfo.findAllByInputDeviceOrOutputDevice(true,true).each {
166
			devicesForCheckBox << it
179
		
180
		def crit1 = DeviceInfo.createCriteria()
181
		devicesForCheckBox = crit1 {
182
			and {
183
				or {
184
					eq("outputDevice",true)
185
					eq("inputDevice",true)
186
				}
187
				eq("hwSet",session.hwSet)
188
			}
189
			order("friendlyName","asc")
167 190
		}
168 191
		
169 192
		[devicesForCheckBox: devicesForCheckBox]
......
241 264
	def clear = {
242 265
		
243 266
		List devicesForCheckBox = new ArrayList()
244
		DeviceInfo.findAllByInputDeviceOrOutputDevice(true,true).each {
245
			devicesForCheckBox << it
267
		
268
		def crit1 = DeviceInfo.createCriteria()
269
		devicesForCheckBox = crit1 {
270
			and {
271
				or {
272
					eq("outputDevice",true)
273
					eq("inputDevice",true)
274
				}
275
				eq("hwSet",session.hwSet)
276
			}
277
			order("friendlyName","asc")
246 278
		}
247 279
		
248 280
		[devicesForCheckBox: devicesForCheckBox]

Also available in: Unified diff