ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'master' 

Minor Fixes

See merge request Shinobi-Systems/Shinobi!196
merge-requests/198/merge
Moe 2020-06-03 18:34:40 +00:00
parent 3dfce986a6 55b988e707
commit 2c93ac0522
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
INSTALL/freenas.csh
View File

@ -7,9 +7,6 @@ pkg install -y nano ffmpeg libav x264 x265 mysql56-server node npm
echo "Enabling mysql..." echo "Enabling mysql..."
sysrc mysql_enable=yes sysrc mysql_enable=yes
service mysql-server start service mysql-server start
echo "Cloning the official Shinobi Community Edition gitlab repo..."
git clone "https://gitlab.com/Shinobi-Systems/ShinobiCE"
cd ./ShinobiCE
echo "Adding Shinobi user to database..." echo "Adding Shinobi user to database..."
mysql -h localhost -u root -e "source sql/user.sql" mysql -h localhost -u root -e "source sql/user.sql"
echo "Shinobi database framework setup..." echo "Shinobi database framework setup..."

7
web/libs/js/dash2.detectorfilter.js
View File

@ -13,7 +13,6 @@ $(document).ready(function(e){
return detectorFiltersSelector.val() return detectorFiltersSelector.val()
} }
var drawOptions = function(){ var drawOptions = function(){
idField.val($.ccio.gid(5))
detectorFiltersSelector.empty() detectorFiltersSelector.empty()
$.each(loadedFilters,function(n,dFilter){ $.each(loadedFilters,function(n,dFilter){
$.ccio.tm('option',{auth_token:$user.auth_token,id:dFilter.id,name:dFilter.filter_name},'#detector_filters') $.ccio.tm('option',{auth_token:$user.auth_token,id:dFilter.id,name:dFilter.filter_name},'#detector_filters')
@ -50,7 +49,7 @@ $(document).ready(function(e){
var actions = $(v).find('[actions]') var actions = $(v).find('[actions]')
form.actions[actions.attr('actions')] = actions.val() form.actions[actions.attr('actions')] = actions.val()
}) })
form.filter_name = 'New Filter' form.filter_name = form.filter_name || 'New Filter'
return form return form
} }
var closeFiltersToMonitorEditor = function(form){ var closeFiltersToMonitorEditor = function(form){
@ -134,7 +133,7 @@ $(document).ready(function(e){
loadedFilters[newId] = form loadedFilters[newId] = form
console.log(form) console.log(form)
drawOptions() drawOptions()
detectorFiltersSelector.val(newId) detectorFiltersSelector.val(newId).change()
} }
var deleteSelectedFilter = function(){ var deleteSelectedFilter = function(){
var newObject = {} var newObject = {}
@ -253,7 +252,7 @@ $(document).ready(function(e){
detectorFiltersWindow.find('.delete-filter').click(function(e){ detectorFiltersWindow.find('.delete-filter').click(function(e){
deleteSelectedFilter() deleteSelectedFilter()
}) })
detectorFiltersForm.on('change','.where-row .form-control, .actions-row .form-control',function(e){ detectorFiltersForm.on('change','[name="filter_name"], .where-row .form-control, .actions-row .form-control',function(e){
updateSelectedFilter() updateSelectedFilter()
}) })
detectorFiltersForm.submit(function(e){ detectorFiltersForm.submit(function(e){