From 5cf1741fe4c65753eb036196f816fccdfb57e572 Mon Sep 17 00:00:00 2001 From: Trapenok Victor Date: Wed, 18 Oct 2017 13:04:17 +1000 Subject: [PATCH 001/110] fixed bug with quotes in vars --- polemarch/static/js/libs/just-watch.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/polemarch/static/js/libs/just-watch.js b/polemarch/static/js/libs/just-watch.js index bc61effc..746ed32d 100644 --- a/polemarch/static/js/libs/just-watch.js +++ b/polemarch/static/js/libs/just-watch.js @@ -119,7 +119,7 @@ var justReactive = { justStrip:function(html) { var tmp = document.createElement("DIV"); - tmp.innerHTML = html; + tmp.innerHTML = html.replace(//g, '>'); return tmp.textContent || tmp.innerText || ""; }, @@ -630,8 +630,8 @@ var justReactive = { { var val = opt.callBack(this[opt.prop], opt.customData) if(val) - { - return " data-just-watch-"+id+" "+opt.attrName+"=\""+ justReactive.justStrip(val).replace(/\"/g, "\\\"") +"\""; + { + return " data-just-watch-"+id+" "+opt.attrName+"=\""+ justReactive.justStrip(val).replace(/"/g, '"') +"\""; } else { @@ -644,8 +644,8 @@ var justReactive = { console.log("bindAttr", opt.prop, val); var html = "" if(val) - { - html = " data-just-watch-"+id+"=\"true\" "+opt.attrName+"=\""+ justReactive.justStrip(val).replace(/\"/g, "\\\"") +"\""; + { + html = " data-just-watch-"+id+"=\"true\" "+opt.attrName+"=\""+ justReactive.justStrip(val).replace(/"/g, '"') +"\""; } else { From c18ba046c61820662e3763e95ba66bd8201316f2 Mon Sep 17 00:00:00 2001 From: Sergey Klyuykov Date: Wed, 18 Oct 2017 15:17:35 +1000 Subject: [PATCH 002/110] Update gitpython lib --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6d749a19..81622fd5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,7 +17,7 @@ jsonfield==2.0.2 uWSGI==2.0.15 # Repo types -gitpython==2.1.6 +gitpython==2.1.7 # additional DB and cache connectors PyMySQL From 42116e95f92b6c446fd68d6b2bac9abcf5d730bb Mon Sep 17 00:00:00 2001 From: Trapenok Victor Date: Thu, 19 Oct 2017 11:53:54 +1000 Subject: [PATCH 003/110] tests for inventory import --- polemarch/static/js/libs/just-watch.js | 11 +- polemarch/static/js/pmInventories.js | 18 +- polemarch/static/js/tests/qUnitTest.js | 294 +++---------------------- 3 files changed, 55 insertions(+), 268 deletions(-) diff --git a/polemarch/static/js/libs/just-watch.js b/polemarch/static/js/libs/just-watch.js index 746ed32d..d93205a4 100644 --- a/polemarch/static/js/libs/just-watch.js +++ b/polemarch/static/js/libs/just-watch.js @@ -118,9 +118,14 @@ var justReactive = { */ justStrip:function(html) { - var tmp = document.createElement("DIV"); - tmp.innerHTML = html.replace(//g, '>'); - return tmp.textContent || tmp.innerText || ""; + if(typeof html != "string") + { + return ""; + } + + var tmp = document.createElement("DIV"); + tmp.innerHTML = html.replace(//g, '>'); + return tmp.textContent || tmp.innerText || ""; }, addMethod:function(setter, prop, method) diff --git a/polemarch/static/js/pmInventories.js b/polemarch/static/js/pmInventories.js index c613ba2f..439a1fd2 100644 --- a/polemarch/static/js/pmInventories.js +++ b/polemarch/static/js/pmInventories.js @@ -1179,4 +1179,20 @@ pmInventories.addSubHosts = function(item_id, hosts_ids) } }); return def.promise(); -} \ No newline at end of file +} + +pmInventories.validateGroupName = function(name) +{ + if(!name) + { + return false; + } + + if(/^[a-zA-Z0-9\-\._]*$/.test(name.toLowerCase())) + { + return true; + } + + return false; +} + diff --git a/polemarch/static/js/tests/qUnitTest.js b/polemarch/static/js/tests/qUnitTest.js index 4f3e6805..ef669599 100644 --- a/polemarch/static/js/tests/qUnitTest.js +++ b/polemarch/static/js/tests/qUnitTest.js @@ -1280,232 +1280,7 @@ os-controller-2.vst.lan ansible_host=10.20.0.8 }) }); - var etalon = { - "hosts": [ - { - "name": "1.2.3.[1:255]", - "type": "RANGE", - "vars": { - - } - }, - { - "name": "124.3.4.[44:55]", - "type": "RANGE", - "vars": { - - } - }, - { - "name": "124.3.5.[1:250]", - "type": "RANGE", - "vars": { - "ansible_host": "10.20.0.2", - "ansible_user": "root", - "ansible_ssh_pass": "eadgbe", - "ansible_ssh_private_key_file": "/root/f.txt" - } - }, - { - "name": "124.3.5.[1:251]", - "type": "RANGE", - "vars": { - "ansible_host": "10.20.0.2", - "ansible_user": "root", - "ansible_ssh_pass": "eadgbe" - } - }, - { - "name": "124.3.5.[1:252]", - "type": "RANGE", - "vars": { - "ansible_host": "10.20.0.12", - "ansible_user": "r\"o\\'ot", - "ansible_ssh_pass": "eadgbe" - } - } - ], - "groups": { - "git": { - "vars": { - - }, - "groups": [ - "ci", - "git-servers" - ], - "hosts": [ - - ], - "children": true - }, - "cloud": { - "vars": { - - }, - "groups": [ - "git", - "services", - "test" - ], - "hosts": [ - - ], - "children": true - }, - "test": { - "vars": { - "ansible_ssh_private_key_file": "/root/f.txt" - }, - "groups": [ - - ], - "hosts": [ - { - "name": "test.vst.lan", - "type": "HOST", - "vars": { - "ansible_user": "centos" - } - }, - { - "name": "test2.vst.lan", - "type": "HOST", - "vars": { - "ansible_host": "172.16.1.26" - } - } - ] - }, - "ci": { - "vars": { - - }, - "groups": [ - - ], - "hosts": [ - { - "name": "git-ci-1", - "type": "HOST", - "vars": { - "ansible_host": "172.16.1.13", - "ansible_ssh_private_key_file": "/root/f.txt" - } - }, - { - "name": "git-ci-2", - "type": "HOST", - "vars": { - "ansible_host": "172.16.1.14" - } - } - ] - }, - "git-servers": { - "vars": { - - }, - "groups": [ - - ], - "hosts": [ - { - "name": "git.vst.lan", - "type": "HOST", - "vars": { - - } - } - ] - }, - "services": { - "vars": { - - }, - "groups": [ - - ], - "hosts": [ - { - "name": "chat.vstconsulting.net", - "type": "HOST", - "vars": { - "ansible_host": "172.16.1.16" - } - }, - { - "name": "pipc.vst.lan", - "type": "HOST", - "vars": { - - } - }, - { - "name": "redmine.vst.lan", - "type": "HOST", - "vars": { - - } - } - ] - }, - "openstack": { - "vars": { - - }, - "groups": [ - - ], - "hosts": [ - { - "name": "fuel.vst.lan", - "type": "HOST", - "vars": { - "ansible_host": "10.20.0.2", - "ansible_user": "root", - "ansible_ssh_pass": "eadgbe" - } - }, - { - "name": "os-compute-1.vst.lan", - "type": "HOST", - "vars": { - "ansible_host": "10.20.0.9" - } - }, - { - "name": "os-compute-2.vst.lan", - "type": "HOST", - "vars": { - "ansible_host": "10.20.0.13", - "ansible_ssh_private_key_file": "/root/f.txt" - } - }, - { - "name": "os-controller-1.vst.lan", - "type": "HOST", - "vars": { - "ansible_host": "10.20.0.6" - } - }, - { - "name": "os-controller-2.vst.lan", - "type": "HOST", - "vars": { - "ansible_host": "10.20.0.8" - } - } - ] - } - }, - "vars": { - "ansible_user": "grey", - "ansible_ssh_private_key_file": "/root/f.txt", - "ansible_ssh_extra_args": "-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" - }, - name : "inventory", - } + var etalon = {"hosts":[{"name":"1.2.3.[1:255]","type":"RANGE","vars":{}},{"name":"124.3.4.[44:55]","type":"RANGE","vars":{}},{"name":"124.3.5.[1:250]","type":"RANGE","vars":{"ansible_host":"10.20.0.2","ansible_user":"root","ansible_ssh_pass":"eadgbe","ansible_ssh_private_key_file":"/root/f.txt"}},{"name":"124.3.5.[1:251]","type":"RANGE","vars":{"ansible_host":"10.20.0.2","ansible_user":"root","ansible_ssh_pass":"eadgbe"}},{"name":"124.3.5.[1:252]","type":"RANGE","vars":{"ansible_host":"10.20.0.12","ansible_user":"r\"o\\'ot","ansible_ssh_pass":"eadgbe"}}],"groups":{"git":{"vars":{},"groups":["ci","git-servers"],"hosts":[],"children":true,"dataLevel":{"level":2,"parents":["all","cloud","git"]}},"ci":{"vars":{},"groups":[],"hosts":[{"name":"git-ci-1","type":"HOST","vars":{"ansible_host":"172.16.1.13","ansible_ssh_private_key_file":"/root/f.txt"}},{"name":"git-ci-2","type":"HOST","vars":{"ansible_host":"172.16.1.14"}}],"dataLevel":{"level":3,"parents":["all","cloud","git","ci"]}},"git-servers":{"vars":{},"groups":[],"hosts":[{"name":"git.vst.lan","type":"HOST","vars":{}}],"dataLevel":{"level":3,"parents":["all","cloud","git","git-servers"]}},"cloud":{"vars":{},"groups":["git","services","test"],"hosts":[],"children":true,"dataLevel":{"level":1,"parents":["all","cloud"]}},"services":{"vars":{},"groups":[],"hosts":[{"name":"chat.vstconsulting.net","type":"HOST","vars":{"ansible_host":"172.16.1.16"}},{"name":"pipc.vst.lan","type":"HOST","vars":{}},{"name":"redmine.vst.lan","type":"HOST","vars":{}}],"dataLevel":{"level":2,"parents":["all","cloud","services"]}},"test":{"vars":{"ansible_ssh_private_key_file":"/root/f.txt"},"groups":[],"hosts":[{"name":"test.vst.lan","type":"HOST","vars":{"ansible_user":"centos"}},{"name":"test2.vst.lan","type":"HOST","vars":{"ansible_host":"172.16.1.26"}}],"dataLevel":{"level":2,"parents":["all","cloud","test"]}},"openstack":{"vars":{},"groups":[],"hosts":[{"name":"fuel.vst.lan","type":"HOST","vars":{"ansible_host":"10.20.0.2","ansible_user":"root","ansible_ssh_pass":"eadgbe"}},{"name":"os-compute-1.vst.lan","type":"HOST","vars":{"ansible_host":"10.20.0.9"}},{"name":"os-compute-2.vst.lan","type":"HOST","vars":{"ansible_host":"10.20.0.13","ansible_ssh_private_key_file":"/root/f.txt"}},{"name":"os-controller-1.vst.lan","type":"HOST","vars":{"ansible_host":"10.20.0.6"}},{"name":"os-controller-2.vst.lan","type":"HOST","vars":{"ansible_host":"10.20.0.8"}}],"dataLevel":{"level":1,"parents":["all","openstack"]}}},"vars":{"ansible_user":"grey","ansible_ssh_private_key_file":"/root/f.txt","ansible_ssh_extra_args":"-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"},"name":"inventory"} var inventory = undefined; syncQUnit.addTest('Парсинг inventory', function ( assert ) @@ -1518,7 +1293,7 @@ os-controller-2.vst.lan ansible_host=10.20.0.8 inventory:inventory, text:pmInventoriesText } - + var res = deepEqual(etalon, inventory) assert.ok(res, 'Сравнение инвентория распарсенного и оригинального'); render(done) @@ -1614,47 +1389,38 @@ G9zCmFuc2libGVfc3NoX3ByaXZhdGVfa2V5X2ZpbGU9L2hvbWUvY2VwcmV1L2RlZmF1bHQucGVtCmFu\ c2libGVfYmVjb21lPXRydWU=" inventoryText = Base64.decode(inventoryText) - var inventory = pmInventories.parseFromText(inventoryText) + inventory = pmInventories.parseFromText(inventoryText) var etalon = { - "hosts": [], - "groups": { - "servers": { - "vars": { - "ansible_user": "centos", - "ansible_ssh_private_key_file": "/home/cepreu/default.pem", - "ansible_become": "true" + "hosts":[], + "groups":{ + "servers":{ + "vars":{"ansible_user":"centos","ansible_ssh_private_key_file":"/home/cepreu/default.pem","ansible_become":"true"}, + "groups":["usual","unusual"], + "hosts":[], + "children":true, + "dataLevel":{"level":1,"parents":["all","servers"]} }, - "groups": [ - "usual", - "unusual" - ], - "hosts": [], - "children": true - }, - "usual": { - "vars": {}, - "groups": [], - "hosts": [ - { - "name": "172.16.1.[30:31]", - "type": "RANGE", - "vars": { - - } - } - ] - }, - "unusual": { - "vars": {}, - "groups": [], - "hosts": [] - } + "usual":{ + "vars":{}, + "groups":[], + "hosts":[ + {"name":"172.16.1.[30:31]","type":"RANGE","vars":{}} + ], + "dataLevel":{"level":2,"parents":["all","servers","usual"]} + }, + "unusual":{ + "vars":{}, + "groups":[], + "hosts":[], + "dataLevel":{"level":2,"parents":["all","servers","unusual"]} + } }, - "vars": {}, - name:"inventory" - } + "vars":{}, + "name":"inventory" + } + inventory.name = "inventory" - + var res = deepEqual(etalon, inventory) assert.ok(res, 'Сравнение инвентория 2 распарсенного и оригинального'); render(done) From ef4a00e745578e2bbcd2098098b75d2c763c1b8f Mon Sep 17 00:00:00 2001 From: Trapenok Victor Date: Thu, 19 Oct 2017 13:05:40 +1000 Subject: [PATCH 004/110] tests refactoring --- polemarch/main/templates/base.html | 2 +- polemarch/main/templates/gui/gui.html | 1 + polemarch/static/js/app.js | 55 +--- polemarch/static/js/common.js | 14 + polemarch/static/js/demo.js | 340 ------------------------ polemarch/static/js/pages/dashboard.js | 210 --------------- polemarch/static/js/pages/dashboard2.js | 274 ------------------- polemarch/static/js/tests/qUnitTest.js | 80 +++--- 8 files changed, 61 insertions(+), 915 deletions(-) create mode 100644 polemarch/static/js/common.js delete mode 100644 polemarch/static/js/demo.js delete mode 100644 polemarch/static/js/pages/dashboard.js delete mode 100644 polemarch/static/js/pages/dashboard2.js diff --git a/polemarch/main/templates/base.html b/polemarch/main/templates/base.html index 8628e085..c431dd32 100644 --- a/polemarch/main/templates/base.html +++ b/polemarch/main/templates/base.html @@ -176,7 +176,7 @@ {% endif %} diff --git a/polemarch/main/templates/gui/gui.html b/polemarch/main/templates/gui/gui.html index fe5dd760..1e215ddb 100644 --- a/polemarch/main/templates/gui/gui.html +++ b/polemarch/main/templates/gui/gui.html @@ -18,6 +18,7 @@ + diff --git a/polemarch/static/js/app.js b/polemarch/static/js/app.js index 2ce0bdd6..b34dbd83 100644 --- a/polemarch/static/js/app.js +++ b/polemarch/static/js/app.js @@ -716,57 +716,4 @@ function _init() { }; })(jQuery); - -/* - * TODO LIST CUSTOM PLUGIN - * ----------------------- - * This plugin depends on iCheck plugin for checkbox and radio inputs - * - * @type plugin - * @usage $("#todo-widget").todolist( options ); - */ -(function ($) { - - 'use strict'; - - $.fn.todolist = function (options) { - // Render options - var settings = $.extend({ - //When the user checks the input - onCheck: function (ele) { - return ele; - }, - //When the user unchecks the input - onUncheck: function (ele) { - return ele; - } - }, options); - - return this.each(function () { - - if (typeof $.fn.iCheck != 'undefined') { - $('input', this).on('ifChecked', function () { - var ele = $(this).parents("li").first(); - ele.toggleClass("done"); - settings.onCheck.call(ele); - }); - - $('input', this).on('ifUnchecked', function () { - var ele = $(this).parents("li").first(); - ele.toggleClass("done"); - settings.onUncheck.call(ele); - }); - } else { - $('input', this).on('change', function () { - var ele = $(this).parents("li").first(); - ele.toggleClass("done"); - if ($('input', ele).is(":checked")) { - settings.onCheck.call(ele); - } else { - settings.onUncheck.call(ele); - } - }); - } - }); - }; -}(jQuery)); + \ No newline at end of file diff --git a/polemarch/static/js/common.js b/polemarch/static/js/common.js new file mode 100644 index 00000000..b8720d1f --- /dev/null +++ b/polemarch/static/js/common.js @@ -0,0 +1,14 @@ +function loadQUnitTests() +{ + + $('body').append(''); + + var intervaId = setInterval(function() + { + if(window.injectQunit !== undefined) + { + clearInterval(intervaId) + injectQunit() + } + }, 1000) +} \ No newline at end of file diff --git a/polemarch/static/js/demo.js b/polemarch/static/js/demo.js deleted file mode 100644 index b18b9bb3..00000000 --- a/polemarch/static/js/demo.js +++ /dev/null @@ -1,340 +0,0 @@ -/** - * AdminLTE Demo Menu - * ------------------ - * You should not use this file in production. - * This file is for demo purposes only. - */ -(function ($, AdminLTE) { - - "use strict"; - - /** - * List of all the available skins - * - * @type Array - */ - var my_skins = [ - "skin-blue", - "skin-black", - "skin-red", - "skin-yellow", - "skin-purple", - "skin-green", - "skin-blue-light", - "skin-black-light", - "skin-red-light", - "skin-yellow-light", - "skin-purple-light", - "skin-green-light" - ]; - - //Create the new tab - var tab_pane = $("
", { - "id": "control-sidebar-theme-demo-options-tab", - "class": "tab-pane active" - }); - - //Create the tab button - var tab_button = $("
  • ", {"class": "active"}) - .html("" - + "" - + ""); - - //Add the tab button to the right sidebar tabs - $("[href='#control-sidebar-home-tab']") - .parent() - .before(tab_button); - - //Create the menu - var demo_settings = $("
    "); - - //Layout options - demo_settings.append( - "

    " - + "Layout Options" - + "

    " - //Fixed layout - + "
    " - + "" - + "

    Activate the fixed layout. You can't use fixed and boxed layouts together

    " - + "
    " - //Boxed layout - + "
    " - + "" - + "

    Activate the boxed layout

    " - + "
    " - //Sidebar Toggle - + "
    " - + "" - + "

    Toggle the left sidebar's state (open or collapse)

    " - + "
    " - //Sidebar mini expand on hover toggle - + "
    " - + "" - + "

    Let the sidebar mini expand on hover

    " - + "
    " - //Control Sidebar Toggle - + "
    " - + "" - + "

    Toggle between slide over content and push content effects

    " - + "
    " - //Control Sidebar Skin Toggle - + "
    " - + "" - + "

    Toggle between dark and light skins for the right sidebar

    " - + "
    " - ); - var skins_list = $("
      ", {"class": 'list-unstyled clearfix'}); - - //Dark sidebar skins - var skin_blue = - $("
    • ", {style: "float:left; width: 33.33333%; padding: 5px;"}) - .append("" - + "
      " - + "
      " - + "      " - + "

      Blue

      "); - skins_list.append(skin_blue); - var skin_black = - $("
    • ", {style: "float:left; width: 33.33333%; padding: 5px;"}) - .append("" - + "
      " - + "
      " - + "      " - + "

      Black

      "); - skins_list.append(skin_black); - var skin_purple = - $("
    • ", {style: "float:left; width: 33.33333%; padding: 5px;"}) - .append("" - + "
      " - + "
      " - + "      " - + "

      Purple

      "); - skins_list.append(skin_purple); - var skin_green = - $("
    • ", {style: "float:left; width: 33.33333%; padding: 5px;"}) - .append("" - + "
      " - + "
      " - + "      " - + "

      Green

      "); - skins_list.append(skin_green); - var skin_red = - $("
    • ", {style: "float:left; width: 33.33333%; padding: 5px;"}) - .append("" - + "
      " - + "
      " - + "      " - + "

      Red

      "); - skins_list.append(skin_red); - var skin_yellow = - $("
    • ", {style: "float:left; width: 33.33333%; padding: 5px;"}) - .append("" - + "
      " - + "
      " - + "      " - + "

      Yellow

      "); - skins_list.append(skin_yellow); - - //Light sidebar skins - var skin_blue_light = - $("
    • ", {style: "float:left; width: 33.33333%; padding: 5px;"}) - .append("" - + "
      " - + "
      " - + "      " - + "

      Blue Light

      "); - skins_list.append(skin_blue_light); - var skin_black_light = - $("
    • ", {style: "float:left; width: 33.33333%; padding: 5px;"}) - .append("" - + "
      " - + "
      " - + "      " - + "

      Black Light

      "); - skins_list.append(skin_black_light); - var skin_purple_light = - $("
    • ", {style: "float:left; width: 33.33333%; padding: 5px;"}) - .append("" - + "
      " - + "
      " - + "      " - + "

      Purple Light

      "); - skins_list.append(skin_purple_light); - var skin_green_light = - $("
    • ", {style: "float:left; width: 33.33333%; padding: 5px;"}) - .append("" - + "
      " - + "
      " - + "      " - + "

      Green Light

      "); - skins_list.append(skin_green_light); - var skin_red_light = - $("
    • ", {style: "float:left; width: 33.33333%; padding: 5px;"}) - .append("" - + "
      " - + "
      " - + "      " - + "

      Red Light

      "); - skins_list.append(skin_red_light); - var skin_yellow_light = - $("
    • ", {style: "float:left; width: 33.33333%; padding: 5px;"}) - .append("" - + "
      " - + "
      " - + "      " - + "

      Yellow Light

      "); - skins_list.append(skin_yellow_light); - - demo_settings.append("

      Skins

      "); - demo_settings.append(skins_list); - - tab_pane.append(demo_settings); - $("#control-sidebar-home-tab").after(tab_pane); - - setup(); - - /** - * Toggles layout classes - * - * @param String cls the layout class to toggle - * @returns void - */ - function change_layout(cls) { - $("body").toggleClass(cls); - AdminLTE.layout.fixSidebar(); - //Fix the problem with right sidebar and layout boxed - if (cls == "layout-boxed") - AdminLTE.controlSidebar._fix($(".control-sidebar-bg")); - if ($('body').hasClass('fixed') && cls == 'fixed') { - AdminLTE.pushMenu.expandOnHover(); - AdminLTE.layout.activate(); - } - AdminLTE.controlSidebar._fix($(".control-sidebar-bg")); - AdminLTE.controlSidebar._fix($(".control-sidebar")); - } - - /** - * Replaces the old skin with the new skin - * @param String cls the new skin class - * @returns Boolean false to prevent link's default action - */ - function change_skin(cls) { - $.each(my_skins, function (i) { - $("body").removeClass(my_skins[i]); - }); - - $("body").addClass(cls); - store('skin', cls); - return false; - } - - /** - * Store a new settings in the browser - * - * @param String name Name of the setting - * @param String val Value of the setting - * @returns void - */ - function store(name, val) { - if (typeof (Storage) !== "undefined") { - localStorage.setItem(name, val); - } else { - window.alert('Please use a modern browser to properly view this template!'); - } - } - - /** - * Get a prestored setting - * - * @param String name Name of of the setting - * @returns String The value of the setting | null - */ - function get(name) { - if (typeof (Storage) !== "undefined") { - return localStorage.getItem(name); - } else { - window.alert('Please use a modern browser to properly view this template!'); - } - } - - /** - * Retrieve default settings and apply them to the template - * - * @returns void - */ - function setup() { - var tmp = get('skin'); - if (tmp && $.inArray(tmp, my_skins)) - change_skin(tmp); - - //Add the change skin listener - $("[data-skin]").on('click', function (e) { - if($(this).hasClass('knob')) - return; - e.preventDefault(); - change_skin($(this).data('skin')); - }); - - //Add the layout manager - $("[data-layout]").on('click', function () { - change_layout($(this).data('layout')); - }); - - $("[data-controlsidebar]").on('click', function () { - change_layout($(this).data('controlsidebar')); - var slide = !AdminLTE.options.controlSidebarOptions.slide; - AdminLTE.options.controlSidebarOptions.slide = slide; - if (!slide) - $('.control-sidebar').removeClass('control-sidebar-open'); - }); - - $("[data-sidebarskin='toggle']").on('click', function () { - var sidebar = $(".control-sidebar"); - if (sidebar.hasClass("control-sidebar-dark")) { - sidebar.removeClass("control-sidebar-dark") - sidebar.addClass("control-sidebar-light") - } else { - sidebar.removeClass("control-sidebar-light") - sidebar.addClass("control-sidebar-dark") - } - }); - - $("[data-enable='expandOnHover']").on('click', function () { - $(this).attr('disabled', true); - AdminLTE.pushMenu.expandOnHover(); - if (!$('body').hasClass('sidebar-collapse')) - $("[data-layout='sidebar-collapse']").click(); - }); - - // Reset options - if ($('body').hasClass('fixed')) { - $("[data-layout='fixed']").attr('checked', 'checked'); - } - if ($('body').hasClass('layout-boxed')) { - $("[data-layout='layout-boxed']").attr('checked', 'checked'); - } - if ($('body').hasClass('sidebar-collapse')) { - $("[data-layout='sidebar-collapse']").attr('checked', 'checked'); - } - - } -})(jQuery, $.AdminLTE); diff --git a/polemarch/static/js/pages/dashboard.js b/polemarch/static/js/pages/dashboard.js deleted file mode 100644 index 0f7c0077..00000000 --- a/polemarch/static/js/pages/dashboard.js +++ /dev/null @@ -1,210 +0,0 @@ -/* - * Author: Abdullah A Almsaeed - * Date: 4 Jan 2014 - * Description: - * This is a demo file used only for the main dashboard (index.html) - **/ - -$(function () { - - "use strict"; - - //Make the dashboard widgets sortable Using jquery UI - $(".connectedSortable").sortable({ - placeholder: "sort-highlight", - connectWith: ".connectedSortable", - handle: ".box-header, .nav-tabs", - forcePlaceholderSize: true, - zIndex: 999999 - }); - $(".connectedSortable .box-header, .connectedSortable .nav-tabs-custom").css("cursor", "move"); - - //jQuery UI sortable for the todo list - $(".todo-list").sortable({ - placeholder: "sort-highlight", - handle: ".handle", - forcePlaceholderSize: true, - zIndex: 999999 - }); - - //bootstrap WYSIHTML5 - text editor - $(".textarea").wysihtml5(); - - $('.daterange').daterangepicker({ - ranges: { - 'Today': [moment(), moment()], - 'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')], - 'Last 7 Days': [moment().subtract(6, 'days'), moment()], - 'Last 30 Days': [moment().subtract(29, 'days'), moment()], - 'This Month': [moment().startOf('month'), moment().endOf('month')], - 'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')] - }, - startDate: moment().subtract(29, 'days'), - endDate: moment() - }, function (start, end) { - window.alert("You chose: " + start.format('MMMM D, YYYY') + ' - ' + end.format('MMMM D, YYYY')); - }); - - /* jQueryKnob */ - $(".knob").knob(); - - //jvectormap data - var visitorsData = { - "US": 398, //USA - "SA": 400, //Saudi Arabia - "CA": 1000, //Canada - "DE": 500, //Germany - "FR": 760, //France - "CN": 300, //China - "AU": 700, //Australia - "BR": 600, //Brazil - "IN": 800, //India - "GB": 320, //Great Britain - "RU": 3000 //Russia - }; - //World map by jvectormap - $('#world-map').vectorMap({ - map: 'world_mill_en', - backgroundColor: "transparent", - regionStyle: { - initial: { - fill: '#e4e4e4', - "fill-opacity": 1, - stroke: 'none', - "stroke-width": 0, - "stroke-opacity": 1 - } - }, - series: { - regions: [{ - values: visitorsData, - scale: ["#92c1dc", "#ebf4f9"], - normalizeFunction: 'polynomial' - }] - }, - onRegionLabelShow: function (e, el, code) { - if (typeof visitorsData[code] != "undefined") - el.html(el.html() + ': ' + visitorsData[code] + ' new visitors'); - } - }); - - //Sparkline charts - var myvalues = [1000, 1200, 920, 927, 931, 1027, 819, 930, 1021]; - $('#sparkline-1').sparkline(myvalues, { - type: 'line', - lineColor: '#92c1dc', - fillColor: "#ebf4f9", - height: '50', - width: '80' - }); - myvalues = [515, 519, 520, 522, 652, 810, 370, 627, 319, 630, 921]; - $('#sparkline-2').sparkline(myvalues, { - type: 'line', - lineColor: '#92c1dc', - fillColor: "#ebf4f9", - height: '50', - width: '80' - }); - myvalues = [15, 19, 20, 22, 33, 27, 31, 27, 19, 30, 21]; - $('#sparkline-3').sparkline(myvalues, { - type: 'line', - lineColor: '#92c1dc', - fillColor: "#ebf4f9", - height: '50', - width: '80' - }); - - //The Calender - $("#calendar").datepicker(); - - //SLIMSCROLL FOR CHAT WIDGET - $('#chat-box').slimScroll({ - height: '250px' - }); - - /* Morris.js Charts */ - // Sales chart - var area = new Morris.Area({ - element: 'revenue-chart', - resize: true, - data: [ - {y: '2011 Q1', item1: 2666, item2: 2666}, - {y: '2011 Q2', item1: 2778, item2: 2294}, - {y: '2011 Q3', item1: 4912, item2: 1969}, - {y: '2011 Q4', item1: 3767, item2: 3597}, - {y: '2012 Q1', item1: 6810, item2: 1914}, - {y: '2012 Q2', item1: 5670, item2: 4293}, - {y: '2012 Q3', item1: 4820, item2: 3795}, - {y: '2012 Q4', item1: 15073, item2: 5967}, - {y: '2013 Q1', item1: 10687, item2: 4460}, - {y: '2013 Q2', item1: 8432, item2: 5713} - ], - xkey: 'y', - ykeys: ['item1', 'item2'], - labels: ['Item 1', 'Item 2'], - lineColors: ['#a0d0e0', '#3c8dbc'], - hideHover: 'auto' - }); - var line = new Morris.Line({ - element: 'line-chart', - resize: true, - data: [ - {y: '2011 Q1', item1: 2666}, - {y: '2011 Q2', item1: 2778}, - {y: '2011 Q3', item1: 4912}, - {y: '2011 Q4', item1: 3767}, - {y: '2012 Q1', item1: 6810}, - {y: '2012 Q2', item1: 5670}, - {y: '2012 Q3', item1: 4820}, - {y: '2012 Q4', item1: 15073}, - {y: '2013 Q1', item1: 10687}, - {y: '2013 Q2', item1: 8432} - ], - xkey: 'y', - ykeys: ['item1'], - labels: ['Item 1'], - lineColors: ['#efefef'], - lineWidth: 2, - hideHover: 'auto', - gridTextColor: "#fff", - gridStrokeWidth: 0.4, - pointSize: 4, - pointStrokeColors: ["#efefef"], - gridLineColor: "#efefef", - gridTextFamily: "Open Sans", - gridTextSize: 10 - }); - - //Donut Chart - var donut = new Morris.Donut({ - element: 'sales-chart', - resize: true, - colors: ["#3c8dbc", "#f56954", "#00a65a"], - data: [ - {label: "Download Sales", value: 12}, - {label: "In-Store Sales", value: 30}, - {label: "Mail-Order Sales", value: 20} - ], - hideHover: 'auto' - }); - - //Fix for charts under tabs - $('.box ul.nav a').on('shown.bs.tab', function () { - area.redraw(); - donut.redraw(); - line.redraw(); - }); - - /* The todo list plugin */ - $(".todo-list").todolist({ - onCheck: function (ele) { - window.console.log("The element has been checked"); - return ele; - }, - onUncheck: function (ele) { - window.console.log("The element has been unchecked"); - return ele; - } - }); - -}); diff --git a/polemarch/static/js/pages/dashboard2.js b/polemarch/static/js/pages/dashboard2.js deleted file mode 100644 index cc67785e..00000000 --- a/polemarch/static/js/pages/dashboard2.js +++ /dev/null @@ -1,274 +0,0 @@ -$(function () { - - 'use strict'; - - /* ChartJS - * ------- - * Here we will create a few charts using ChartJS - */ - - //----------------------- - //- MONTHLY SALES CHART - - //----------------------- - - // Get context with jQuery - using jQuery's .get() method. - var salesChartCanvas = $("#salesChart").get(0).getContext("2d"); - // This will get the first returned node in the jQuery collection. - var salesChart = new Chart(salesChartCanvas); - - var salesChartData = { - labels: ["January", "February", "March", "April", "May", "June", "July"], - datasets: [ - { - label: "Electronics", - fillColor: "rgb(210, 214, 222)", - strokeColor: "rgb(210, 214, 222)", - pointColor: "rgb(210, 214, 222)", - pointStrokeColor: "#c1c7d1", - pointHighlightFill: "#fff", - pointHighlightStroke: "rgb(220,220,220)", - data: [65, 59, 80, 81, 56, 55, 40] - }, - { - label: "Digital Goods", - fillColor: "rgba(60,141,188,0.9)", - strokeColor: "rgba(60,141,188,0.8)", - pointColor: "#3b8bba", - pointStrokeColor: "rgba(60,141,188,1)", - pointHighlightFill: "#fff", - pointHighlightStroke: "rgba(60,141,188,1)", - data: [28, 48, 40, 19, 86, 27, 90] - } - ] - }; - - var salesChartOptions = { - //Boolean - If we should show the scale at all - showScale: true, - //Boolean - Whether grid lines are shown across the chart - scaleShowGridLines: false, - //String - Colour of the grid lines - scaleGridLineColor: "rgba(0,0,0,.05)", - //Number - Width of the grid lines - scaleGridLineWidth: 1, - //Boolean - Whether to show horizontal lines (except X axis) - scaleShowHorizontalLines: true, - //Boolean - Whether to show vertical lines (except Y axis) - scaleShowVerticalLines: true, - //Boolean - Whether the line is curved between points - bezierCurve: true, - //Number - Tension of the bezier curve between points - bezierCurveTension: 0.3, - //Boolean - Whether to show a dot for each point - pointDot: false, - //Number - Radius of each point dot in pixels - pointDotRadius: 4, - //Number - Pixel width of point dot stroke - pointDotStrokeWidth: 1, - //Number - amount extra to add to the radius to cater for hit detection outside the drawn point - pointHitDetectionRadius: 20, - //Boolean - Whether to show a stroke for datasets - datasetStroke: true, - //Number - Pixel width of dataset stroke - datasetStrokeWidth: 2, - //Boolean - Whether to fill the dataset with a color - datasetFill: true, - //String - A legend template - legendTemplate: "
        -legend\"><% for (var i=0; i
      • \"><%=datasets[i].label%>
        • <%}%>
      ", - //Boolean - whether to maintain the starting aspect ratio or not when responsive, if set to false, will take up entire container - maintainAspectRatio: true, - //Boolean - whether to make the chart responsive to window resizing - responsive: true - }; - - //Create the line chart - salesChart.Line(salesChartData, salesChartOptions); - - //--------------------------- - //- END MONTHLY SALES CHART - - //--------------------------- - - //------------- - //- PIE CHART - - //------------- - // Get context with jQuery - using jQuery's .get() method. - var pieChartCanvas = $("#pieChart").get(0).getContext("2d"); - var pieChart = new Chart(pieChartCanvas); - var PieData = [ - { - value: 700, - color: "#f56954", - highlight: "#f56954", - label: "Chrome" - }, - { - value: 500, - color: "#00a65a", - highlight: "#00a65a", - label: "IE" - }, - { - value: 400, - color: "#f39c12", - highlight: "#f39c12", - label: "FireFox" - }, - { - value: 600, - color: "#00c0ef", - highlight: "#00c0ef", - label: "Safari" - }, - { - value: 300, - color: "#3c8dbc", - highlight: "#3c8dbc", - label: "Opera" - }, - { - value: 100, - color: "#d2d6de", - highlight: "#d2d6de", - label: "Navigator" - } - ]; - var pieOptions = { - //Boolean - Whether we should show a stroke on each segment - segmentShowStroke: true, - //String - The colour of each segment stroke - segmentStrokeColor: "#fff", - //Number - The width of each segment stroke - segmentStrokeWidth: 1, - //Number - The percentage of the chart that we cut out of the middle - percentageInnerCutout: 50, // This is 0 for Pie charts - //Number - Amount of animation steps - animationSteps: 100, - //String - Animation easing effect - animationEasing: "easeOutBounce", - //Boolean - Whether we animate the rotation of the Doughnut - animateRotate: true, - //Boolean - Whether we animate scaling the Doughnut from the centre - animateScale: false, - //Boolean - whether to make the chart responsive to window resizing - responsive: true, - // Boolean - whether to maintain the starting aspect ratio or not when responsive, if set to false, will take up entire container - maintainAspectRatio: false, - //String - A legend template - legendTemplate: "
        -legend\"><% for (var i=0; i
      • \"><%if(segments[i].label){%><%=segments[i].label%><%}%>
        • <%}%>
      ", - //String - A tooltip template - tooltipTemplate: "<%=value %> <%=label%> users" - }; - //Create pie or douhnut chart - // You can switch between pie and douhnut using the method below. - pieChart.Doughnut(PieData, pieOptions); - //----------------- - //- END PIE CHART - - //----------------- - - /* jVector Maps - * ------------ - * Create a world map with markers - */ - $('#world-map-markers').vectorMap({ - map: 'world_mill_en', - normalizeFunction: 'polynomial', - hoverOpacity: 0.7, - hoverColor: false, - backgroundColor: 'transparent', - regionStyle: { - initial: { - fill: 'rgba(210, 214, 222, 1)', - "fill-opacity": 1, - stroke: 'none', - "stroke-width": 0, - "stroke-opacity": 1 - }, - hover: { - "fill-opacity": 0.7, - cursor: 'pointer' - }, - selected: { - fill: 'yellow' - }, - selectedHover: {} - }, - markerStyle: { - initial: { - fill: '#00a65a', - stroke: '#111' - } - }, - markers: [ - {latLng: [41.90, 12.45], name: 'Vatican City'}, - {latLng: [43.73, 7.41], name: 'Monaco'}, - {latLng: [-0.52, 166.93], name: 'Nauru'}, - {latLng: [-8.51, 179.21], name: 'Tuvalu'}, - {latLng: [43.93, 12.46], name: 'San Marino'}, - {latLng: [47.14, 9.52], name: 'Liechtenstein'}, - {latLng: [7.11, 171.06], name: 'Marshall Islands'}, - {latLng: [17.3, -62.73], name: 'Saint Kitts and Nevis'}, - {latLng: [3.2, 73.22], name: 'Maldives'}, - {latLng: [35.88, 14.5], name: 'Malta'}, - {latLng: [12.05, -61.75], name: 'Grenada'}, - {latLng: [13.16, -61.23], name: 'Saint Vincent and the Grenadines'}, - {latLng: [13.16, -59.55], name: 'Barbados'}, - {latLng: [17.11, -61.85], name: 'Antigua and Barbuda'}, - {latLng: [-4.61, 55.45], name: 'Seychelles'}, - {latLng: [7.35, 134.46], name: 'Palau'}, - {latLng: [42.5, 1.51], name: 'Andorra'}, - {latLng: [14.01, -60.98], name: 'Saint Lucia'}, - {latLng: [6.91, 158.18], name: 'Federated States of Micronesia'}, - {latLng: [1.3, 103.8], name: 'Singapore'}, - {latLng: [1.46, 173.03], name: 'Kiribati'}, - {latLng: [-21.13, -175.2], name: 'Tonga'}, - {latLng: [15.3, -61.38], name: 'Dominica'}, - {latLng: [-20.2, 57.5], name: 'Mauritius'}, - {latLng: [26.02, 50.55], name: 'Bahrain'}, - {latLng: [0.33, 6.73], name: 'São Tomé and Príncipe'} - ] - }); - - /* SPARKLINE CHARTS - * ---------------- - * Create a inline charts with spark line - */ - - //----------------- - //- SPARKLINE BAR - - //----------------- - $('.sparkbar').each(function () { - var $this = $(this); - $this.sparkline('html', { - type: 'bar', - height: $this.data('height') ? $this.data('height') : '30', - barColor: $this.data('color') - }); - }); - - //----------------- - //- SPARKLINE PIE - - //----------------- - $('.sparkpie').each(function () { - var $this = $(this); - $this.sparkline('html', { - type: 'pie', - height: $this.data('height') ? $this.data('height') : '90', - sliceColors: $this.data('color') - }); - }); - - //------------------ - //- SPARKLINE LINE - - //------------------ - $('.sparkline').each(function () { - var $this = $(this); - $this.sparkline('html', { - type: 'line', - height: $this.data('height') ? $this.data('height') : '90', - width: '100%', - lineColor: $this.data('linecolor'), - fillColor: $this.data('fillcolor'), - spotColor: $this.data('spotcolor') - }); - }); -}); diff --git a/polemarch/static/js/tests/qUnitTest.js b/polemarch/static/js/tests/qUnitTest.js index ef669599..6b137793 100644 --- a/polemarch/static/js/tests/qUnitTest.js +++ b/polemarch/static/js/tests/qUnitTest.js @@ -234,6 +234,11 @@ function saveReport() console.log("saveReport") } +/** + * В этом массиве должны быть qunit тесты для приложения + */ +window.qunitTestsArray = [] + /** * Вставляет Qunit и запускает выполнение тестов. */ @@ -282,7 +287,10 @@ function injectQunit() } }) - qunitAddTests() + for(var i in window.qunitTestsArray) + { + window.qunitTestsArray[i].call() + } syncQUnit.nextTest() }, 500) @@ -321,9 +329,9 @@ syncQUnit.nextTest = function(name, test) /////////////////////////////////////////////// /** - * В этой функции должны быть qunit тесты для приложения + * qunitAddTests_trim */ -function qunitAddTests() +window.qunitTestsArray.push(function() { syncQUnit.addTest('trim', function ( assert ) { var done = assert.async(); @@ -338,21 +346,13 @@ function qunitAddTests() assert.equal(trim(' x y '), 'x y', 'Табы и пробелы внутри строки не трогаем'); render(done); - }); - - qunitAddTests_users() - qunitAddTests_hosts() - qunitAddTests_groups() - qunitAddTests_inventories() - qunitAddTests_projects() - qunitAddTests_templates_task() - qunitAddTests_templates_modules() -} + }); +}) /** * Тестирование users */ -function qunitAddTests_users() +window.qunitTestsArray.push(function() { syncQUnit.addTest('Открытие списка пользователей', function ( assert ) { @@ -584,13 +584,13 @@ function qunitAddTests_users() render(done) }) }); -} +}) /** * Тестирование hosts */ -function qunitAddTests_hosts() +window.qunitTestsArray.push(function() { syncQUnit.addTest('Открытие списка хостов', function ( assert ) { @@ -744,13 +744,13 @@ function qunitAddTests_hosts() render(done) }) }); -} +}) /** * Тестирование groups */ -function qunitAddTests_groups() +window.qunitTestsArray.push(function() { syncQUnit.addTest('Проверка функции validateHostName', function ( assert ) { var done = assert.async(); @@ -1004,13 +1004,13 @@ function qunitAddTests_groups() render(done) }) }); -} +}) /** * Тестирование inventories */ -function qunitAddTests_inventories() +window.qunitTestsArray.push(function() { syncQUnit.addTest('Список инвенториев', function ( assert ) { @@ -1425,12 +1425,12 @@ c2libGVfYmVjb21lPXRydWU=" assert.ok(res, 'Сравнение инвентория 2 распарсенного и оригинального'); render(done) }); -} +}) /** * Тестирование projects */ -function qunitAddTests_projects() +window.qunitTestsArray.push(function() { syncQUnit.addTest('Список проектов', function ( assert ) { @@ -2101,10 +2101,13 @@ function qunitAddTests_projects() render(done) }) }); -} - -function qunitAddTests_templates_task(){ +}) +/** + * Тестирование шаблонов + */ +window.qunitTestsArray.push(function() +{ syncQUnit.addTest('Список шаблонов', function ( assert ) { var done = assert.async(); @@ -2282,10 +2285,13 @@ function qunitAddTests_templates_task(){ render(done) }) }); -} - -function qunitAddTests_templates_modules(){ +}) +/** + * Тестирование шаблонов модулей + */ +window.qunitTestsArray.push(function() +{ syncQUnit.addTest('Список шаблонов', function ( assert ) { var done = assert.async(); @@ -2466,10 +2472,12 @@ function qunitAddTests_templates_modules(){ render(done) }) }); -} - - -function qunitAddTests_history() +}) + +/** + * Тестирование history + */ +window.qunitTestsArray.push(function() { syncQUnit.addTest('Страница history', function ( assert ) { @@ -2486,8 +2494,9 @@ function qunitAddTests_history() }) }); - syncQUnit.addTest('Страница history', function ( assert ) + syncQUnit.addTest('Страница history 2', function ( assert ) { + debugger; var done = assert.async(); if(!pmHistory.model.itemslist.results.length) @@ -2496,7 +2505,7 @@ function qunitAddTests_history() render(done) } - $.when(spajs.open({ menuId:"history/"+pmHistory.model.itemslist.results[0].id+"/"})).done(function() + $.when(spajs.open({ menuId:"history/"+pmHistory.model.itemslist.results[0].id})).done(function() { assert.ok(true, 'Успешно открыта страница history'); render(done) @@ -2507,6 +2516,5 @@ function qunitAddTests_history() }) }); -} +}) -injectQunit() \ No newline at end of file From 95c62f42c8302294803d8806f07f90c1d80859d4 Mon Sep 17 00:00:00 2001 From: Trapenok Victor Date: Fri, 20 Oct 2017 11:58:10 +1000 Subject: [PATCH 005/110] tests for inventory import --- polemarch/static/js/common.js | 73 +++++++++++++++++- polemarch/static/js/pmInventories.js | 103 +++++++++++++++---------- polemarch/static/js/pmItems.js | 11 --- polemarch/static/js/tests/qUnitTest.js | 45 +++++++---- 4 files changed, 162 insertions(+), 70 deletions(-) diff --git a/polemarch/static/js/common.js b/polemarch/static/js/common.js index b8720d1f..49229417 100644 --- a/polemarch/static/js/common.js +++ b/polemarch/static/js/common.js @@ -11,4 +11,75 @@ function loadQUnitTests() injectQunit() } }, 1000) -} \ No newline at end of file +} + + +function addslashes(string) { + return string.replace(/\\/g, '\\\\'). + replace(/\u0008/g, '\\b'). + replace(/\t/g, '\\t'). + replace(/\n/g, '\\n'). + replace(/\f/g, '\\f'). + //replace(/\r/g, '\\r'). + //replace(/\a/g, '\\a'). + replace(/\v/g, '\\v'). + //replace(/\e/g, '\\e'). + replace(/'/g, '\\\''). + replace(/"/g, '\\"'); +} + +function stripslashes (str) { + // discuss at: http://locutus.io/php/stripslashes/ + // original by: Kevin van Zonneveld (http://kvz.io) + // improved by: Ates Goral (http://magnetiq.com) + // improved by: marrtins + // improved by: rezna + // fixed by: Mick@el + // bugfixed by: Onno Marsman (https://twitter.com/onnomarsman) + // bugfixed by: Brett Zamir (http://brett-zamir.me) + // input by: Rick Waldron + // input by: Brant Messenger (http://www.brantmessenger.com/) + // reimplemented by: Brett Zamir (http://brett-zamir.me) + // example 1: stripslashes('Kevin\'s code') + // returns 1: "Kevin's code" + // example 2: stripslashes('Kevin\\\'s code') + // returns 2: "Kevin\'s code" + return (str + '') + .replace(/\\(.?)/g, function (s, n1) { + switch (n1) { + case '\\': + return '\\' + case '0': + return '\u0000' + case 't': + return "\t" + case 'n': + return "\n" + case 'f': + return "\f" + //case 'e': + // return "\e" + case 'v': + return "\v" + //case 'a': + // return "\a" + case 'b': + return "\b" + //case 'r': + // return "\r" + case '': + return '' + default: + return n1 + } + }) +} +/** + * Тестовый тест, чтоб было видно что тесты вообще хоть как то работают. + */ +function trim(s) +{ + if(s) return s.replace(/^ */g, "").replace(/ *$/g, "") + return ''; +} + diff --git a/polemarch/static/js/pmInventories.js b/polemarch/static/js/pmInventories.js index 439a1fd2..141e6b8d 100644 --- a/polemarch/static/js/pmInventories.js +++ b/polemarch/static/js/pmInventories.js @@ -12,7 +12,7 @@ pmInventories.model.className = "pmInventories" pmInventories.parseMonoVarsLine = function(index, line) { var vars = {} - var param = /^([^=]+)=(.*)$/.exec(line) + var param = /^([^=]+)="(.*)"$/.exec(line) if(param) { @@ -20,17 +20,25 @@ pmInventories.parseMonoVarsLine = function(index, line) } else { - throw "Error in line "+index+" invalid varibles string ("+line+")" + param = /^([^=]+)=(.*)$/.exec(line) + if(param) + { + vars[param[1]] = param[2] + } + else + { + throw "Error in line "+index+" invalid varibles string ("+line+")" + } } return vars; } - + /** * Параметры хоста * Строка где может быть несколько параметров ключ=значение через пробел */ pmInventories.parseVarsLine = function(index, line) -{ +{ var vars = {} do{ if(line.length == 0) @@ -38,37 +46,37 @@ pmInventories.parseVarsLine = function(index, line) break; } - var params = /^([^=]+)=["'](.*?)["'] [^=]+=/.exec(line) + var params = /^([^=]+)=["'](.*?)["'] +[^=]+=/.exec(line) if(params) { - params[1] = trim(params[1]) - vars[params[1]] = params[2] + params[1] = trim(params[1]) + vars[params[1]] = stripslashes(params[2]) line = trim(line.slice(params[1].length + params[2].length + 3)) continue; } - params = /^([^=]+)=["'](.*?)["']$/.exec(line) + params = /^([^=]+)=([^ ]*) +[^=]+=/.exec(line) if(params) { - params[1] = trim(params[1]) - vars[params[1]] = params[2] - break; + params[1] = trim(params[1]) + vars[params[1]] = stripslashes(params[2]) + line = trim(line.slice(params[1].length + params[2].length + 1)) + continue; } - params = /^([^=]+)=(.*?) [^=]+=/.exec(line) + params = /^([^=]+)=["'](.*?)["'] *$/.exec(line) if(params) { - params[1] = trim(params[1]) - vars[params[1]] = params[2] - line = trim(line.slice(params[1].length + params[2].length + 1)) - continue; + params[1] = trim(params[1]) + vars[params[1]] = stripslashes(params[2]) + break; } - params = /^([^=]+)=(.*?)$/.exec(line) + params = /^([^=]+)=([^ ]*) *$/.exec(line) if(params) { - params[1] = trim(params[1]) - vars[params[1]] = params[2] + params[1] = trim(params[1]) + vars[params[1]] = stripslashes(params[2]) line = trim(line.slice(params[1].length + params[2].length + 1)) continue; } @@ -223,7 +231,7 @@ pmInventories.parseFromText = function(text) for(var i in lines) { - var line = lines[i] + var line = lines[i].replace(/^ */g, "") if(/^\s*[#;]\s+inventory name: (.*)/ig.test(line)) { @@ -408,28 +416,41 @@ pmInventories.importInventoriesAndOpen = function(inventory) }).promise() } +pmInventories.showGroupVarsModal = function(opt) +{ + return jsonEditor.jsonEditorScrollTo("ansible_ssh_private_key_file", "group"+opt.name) +} + +pmInventories.showHostVarsModal = function(opt) +{ + return jsonEditor.jsonEditorScrollTo("ansible_ssh_private_key_file", "host"+opt.name) +} + +pmInventories.showInventoryVarsModal = function(opt) +{ + return jsonEditor.jsonEditorScrollTo("ansible_ssh_private_key_file", "inventory") +} + pmInventories.importInventory = function(inventory) { - var def2 = new $.Deferred(); - var vars = jsonEditor.jsonEditorGetValues('inventory') - if(vars.ansible_ssh_private_key_file !== undefined && !/-----BEGIN RSA PRIVATE KEY-----/.test(vars.ansible_ssh_private_key_file)) + var def2 = new $.Deferred(); + if(inventory.vars.ansible_ssh_private_key_file !== undefined && !/-----BEGIN RSA PRIVATE KEY-----/.test(inventory.vars.ansible_ssh_private_key_file)) { // - $.notify("Error in field ansible_ssh_private_key_file invalid value", "error"); - jsonEditor.jsonEditorScrollTo("ansible_ssh_private_key_file", "inventory") + $.notify("Error in field ansible_ssh_private_key_file invalid value", "error"); + pmInventories.showInventoryVarsModal(); def2.reject() return def2.promise(); } for(var i in inventory.hosts) { - var val = inventory.hosts[i] - var vars = jsonEditor.jsonEditorGetValues('host'+val.name) - if(vars.ansible_ssh_private_key_file !== undefined && !/-----BEGIN RSA PRIVATE KEY-----/.test(vars.ansible_ssh_private_key_file)) + var val = inventory.hosts[i] + if(val.vars.ansible_ssh_private_key_file !== undefined && !/-----BEGIN RSA PRIVATE KEY-----/.test(val.vars.ansible_ssh_private_key_file)) { // $.notify("Error in field ansible_ssh_private_key_file invalid value", "error"); - jsonEditor.jsonEditorScrollTo("ansible_ssh_private_key_file", "host"+val.name) + pmInventories.showHostVarsModal({group:'all', name:val.name}); def2.reject() return def2.promise(); } @@ -437,26 +458,24 @@ pmInventories.importInventory = function(inventory) for(var i in inventory.groups) { - var val = inventory.groups[i] - var vars = jsonEditor.jsonEditorGetValues('group'+i) - if(vars.ansible_ssh_private_key_file !== undefined && !/-----BEGIN RSA PRIVATE KEY-----/.test(vars.ansible_ssh_private_key_file)) + var val = inventory.groups[i] + if(val.vars.ansible_ssh_private_key_file !== undefined && !/-----BEGIN RSA PRIVATE KEY-----/.test(val.vars.ansible_ssh_private_key_file)) { // $.notify("Error in field ansible_ssh_private_key_file invalid value", "error"); - jsonEditor.jsonEditorScrollTo("ansible_ssh_private_key_file", "group"+i) + pmInventories.showGroupVarsModal({name:i}); def2.reject() return def2.promise(); } for(var j in val.hosts) { - var hval = val.hosts[j] - var vars = jsonEditor.jsonEditorGetValues('host'+hval.name) - if(vars.ansible_ssh_private_key_file !== undefined && !/-----BEGIN RSA PRIVATE KEY-----/.test(vars.ansible_ssh_private_key_file)) + var hval = val.hosts[j] + if(hval.vars.ansible_ssh_private_key_file !== undefined && !/-----BEGIN RSA PRIVATE KEY-----/.test(hval.vars.ansible_ssh_private_key_file)) { // - $.notify("Error in field ansible_ssh_private_key_file invalid value", "error"); - jsonEditor.jsonEditorScrollTo("ansible_ssh_private_key_file", "host"+hval.name) + $.notify("Error in field ansible_ssh_private_key_file invalid value", "error"); + pmInventories.showHostVarsModal({group:i, name:hval.name}); def2.reject() return def2.promise(); } @@ -479,7 +498,7 @@ pmInventories.importInventory = function(inventory) var inventoryObject = { name:inventory.name, - vars:jsonEditor.jsonEditorGetValues('inventory') + vars:inventory.vars } var deleteBulk = [] @@ -502,7 +521,7 @@ pmInventories.importInventory = function(inventory) data:{ name:i, children:val.children, - vars:jsonEditor.jsonEditorGetValues('group'+i) + vars:val.vars } }) @@ -515,7 +534,7 @@ pmInventories.importInventory = function(inventory) data:{ name:hval.name, type:hval.type, - vars:jsonEditor.jsonEditorGetValues('host'+hval.name) + vars:hval.vars } }) } @@ -532,7 +551,7 @@ pmInventories.importInventory = function(inventory) data:{ name:val.name, type:val.type, - vars:jsonEditor.jsonEditorGetValues('host'+val.name) + vars:val.vars } }) } diff --git a/polemarch/static/js/pmItems.js b/polemarch/static/js/pmItems.js index 99ce69b1..5dc55969 100644 --- a/polemarch/static/js/pmItems.js +++ b/polemarch/static/js/pmItems.js @@ -716,14 +716,3 @@ pmItems.exportSelecedToFile = function(){ return this.exportToFile(item_ids) } - - -/** - * Тестовый тест, чтоб было видно что тесты вообще хоть как то работают. - */ -function trim(s) -{ - if(s) return s.replace(/^ */g, "").replace(/ *$/g, "") - return ''; -} - diff --git a/polemarch/static/js/tests/qUnitTest.js b/polemarch/static/js/tests/qUnitTest.js index 6b137793..11077543 100644 --- a/polemarch/static/js/tests/qUnitTest.js +++ b/polemarch/static/js/tests/qUnitTest.js @@ -347,6 +347,24 @@ window.qunitTestsArray.push(function() render(done); }); + + syncQUnit.addTest('trim', function ( assert ) { + var done = assert.async(); + + var stringArr = [ + "abc", + "A \" A", + "A ' \\ \\\\ \t \\ \ g \" ' \' ", + '"', + 'a"b\' g \" \t \ \\ \\\ c', + ' \' \\ " \t \r \b \e \c \d \n' , + ]; + for(var i in stringArr) + { + assert.equal(stripslashes(addslashes(stringArr[i])), stringArr[i], "i:"+stringArr[i]); + } + render(done); + }); }) /** @@ -1214,7 +1232,7 @@ N0PTEwLjIwLjAuOAo=" 124.3.4.[44:55] 124.3.5.[1:250] ansible_host=10.20.0.2 ansible_user=root ansible_ssh_pass=eadgbe ansible_ssh_private_key_file=/root/f.txt 124.3.5.[1:251] ansible_host="10.20.0.2" ansible_user='root' ansible_ssh_pass=eadgbe -124.3.5.[1:252] ansible_host="10.20.0.12" ansible_user='r"o\'ot' ansible_ssh_pass=eadgbe +124.3.5.[1:252] ansible_host="10.20.0.12" ansible_user="r\"o\'ot" ansible_ssh_pass=eadgbe # Global vars [all:vars] @@ -1280,7 +1298,7 @@ os-controller-2.vst.lan ansible_host=10.20.0.8 }) }); - var etalon = {"hosts":[{"name":"1.2.3.[1:255]","type":"RANGE","vars":{}},{"name":"124.3.4.[44:55]","type":"RANGE","vars":{}},{"name":"124.3.5.[1:250]","type":"RANGE","vars":{"ansible_host":"10.20.0.2","ansible_user":"root","ansible_ssh_pass":"eadgbe","ansible_ssh_private_key_file":"/root/f.txt"}},{"name":"124.3.5.[1:251]","type":"RANGE","vars":{"ansible_host":"10.20.0.2","ansible_user":"root","ansible_ssh_pass":"eadgbe"}},{"name":"124.3.5.[1:252]","type":"RANGE","vars":{"ansible_host":"10.20.0.12","ansible_user":"r\"o\\'ot","ansible_ssh_pass":"eadgbe"}}],"groups":{"git":{"vars":{},"groups":["ci","git-servers"],"hosts":[],"children":true,"dataLevel":{"level":2,"parents":["all","cloud","git"]}},"ci":{"vars":{},"groups":[],"hosts":[{"name":"git-ci-1","type":"HOST","vars":{"ansible_host":"172.16.1.13","ansible_ssh_private_key_file":"/root/f.txt"}},{"name":"git-ci-2","type":"HOST","vars":{"ansible_host":"172.16.1.14"}}],"dataLevel":{"level":3,"parents":["all","cloud","git","ci"]}},"git-servers":{"vars":{},"groups":[],"hosts":[{"name":"git.vst.lan","type":"HOST","vars":{}}],"dataLevel":{"level":3,"parents":["all","cloud","git","git-servers"]}},"cloud":{"vars":{},"groups":["git","services","test"],"hosts":[],"children":true,"dataLevel":{"level":1,"parents":["all","cloud"]}},"services":{"vars":{},"groups":[],"hosts":[{"name":"chat.vstconsulting.net","type":"HOST","vars":{"ansible_host":"172.16.1.16"}},{"name":"pipc.vst.lan","type":"HOST","vars":{}},{"name":"redmine.vst.lan","type":"HOST","vars":{}}],"dataLevel":{"level":2,"parents":["all","cloud","services"]}},"test":{"vars":{"ansible_ssh_private_key_file":"/root/f.txt"},"groups":[],"hosts":[{"name":"test.vst.lan","type":"HOST","vars":{"ansible_user":"centos"}},{"name":"test2.vst.lan","type":"HOST","vars":{"ansible_host":"172.16.1.26"}}],"dataLevel":{"level":2,"parents":["all","cloud","test"]}},"openstack":{"vars":{},"groups":[],"hosts":[{"name":"fuel.vst.lan","type":"HOST","vars":{"ansible_host":"10.20.0.2","ansible_user":"root","ansible_ssh_pass":"eadgbe"}},{"name":"os-compute-1.vst.lan","type":"HOST","vars":{"ansible_host":"10.20.0.9"}},{"name":"os-compute-2.vst.lan","type":"HOST","vars":{"ansible_host":"10.20.0.13","ansible_ssh_private_key_file":"/root/f.txt"}},{"name":"os-controller-1.vst.lan","type":"HOST","vars":{"ansible_host":"10.20.0.6"}},{"name":"os-controller-2.vst.lan","type":"HOST","vars":{"ansible_host":"10.20.0.8"}}],"dataLevel":{"level":1,"parents":["all","openstack"]}}},"vars":{"ansible_user":"grey","ansible_ssh_private_key_file":"/root/f.txt","ansible_ssh_extra_args":"-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"},"name":"inventory"} + var etalon = {"hosts":[{"name":"1.2.3.[1:255]","type":"RANGE","vars":{}},{"name":"124.3.4.[44:55]","type":"RANGE","vars":{}},{"name":"124.3.5.[1:250]","type":"RANGE","vars":{"ansible_host":"10.20.0.2","ansible_user":"root","ansible_ssh_pass":"eadgbe","ansible_ssh_private_key_file":"/root/f.txt"}},{"name":"124.3.5.[1:251]","type":"RANGE","vars":{"ansible_host":"10.20.0.2","ansible_user":"root","ansible_ssh_pass":"eadgbe"}},{"name":"124.3.5.[1:252]","type":"RANGE","vars":{"ansible_host":"10.20.0.12","ansible_user":"r\"o\'ot","ansible_ssh_pass":"eadgbe"}}],"groups":{"git":{"vars":{},"groups":["ci","git-servers"],"hosts":[],"children":true,"dataLevel":{"level":2,"parents":["all","cloud","git"]}},"ci":{"vars":{},"groups":[],"hosts":[{"name":"git-ci-1","type":"HOST","vars":{"ansible_host":"172.16.1.13","ansible_ssh_private_key_file":"/root/f.txt"}},{"name":"git-ci-2","type":"HOST","vars":{"ansible_host":"172.16.1.14"}}],"dataLevel":{"level":3,"parents":["all","cloud","git","ci"]}},"git-servers":{"vars":{},"groups":[],"hosts":[{"name":"git.vst.lan","type":"HOST","vars":{}}],"dataLevel":{"level":3,"parents":["all","cloud","git","git-servers"]}},"cloud":{"vars":{},"groups":["git","services","test"],"hosts":[],"children":true,"dataLevel":{"level":1,"parents":["all","cloud"]}},"services":{"vars":{},"groups":[],"hosts":[{"name":"chat.vstconsulting.net","type":"HOST","vars":{"ansible_host":"172.16.1.16"}},{"name":"pipc.vst.lan","type":"HOST","vars":{}},{"name":"redmine.vst.lan","type":"HOST","vars":{}}],"dataLevel":{"level":2,"parents":["all","cloud","services"]}},"test":{"vars":{"ansible_ssh_private_key_file":"/root/f.txt"},"groups":[],"hosts":[{"name":"test.vst.lan","type":"HOST","vars":{"ansible_user":"centos"}},{"name":"test2.vst.lan","type":"HOST","vars":{"ansible_host":"172.16.1.26"}}],"dataLevel":{"level":2,"parents":["all","cloud","test"]}},"openstack":{"vars":{},"groups":[],"hosts":[{"name":"fuel.vst.lan","type":"HOST","vars":{"ansible_host":"10.20.0.2","ansible_user":"root","ansible_ssh_pass":"eadgbe"}},{"name":"os-compute-1.vst.lan","type":"HOST","vars":{"ansible_host":"10.20.0.9"}},{"name":"os-compute-2.vst.lan","type":"HOST","vars":{"ansible_host":"10.20.0.13","ansible_ssh_private_key_file":"/root/f.txt"}},{"name":"os-controller-1.vst.lan","type":"HOST","vars":{"ansible_host":"10.20.0.6"}},{"name":"os-controller-2.vst.lan","type":"HOST","vars":{"ansible_host":"10.20.0.8"}}],"dataLevel":{"level":1,"parents":["all","openstack"]}}},"vars":{"ansible_user":"grey","ansible_ssh_private_key_file":"/root/f.txt","ansible_ssh_extra_args":"-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"},"name":"inventory"} var inventory = undefined; syncQUnit.addTest('Парсинг inventory', function ( assert ) @@ -1293,7 +1311,7 @@ os-controller-2.vst.lan ansible_host=10.20.0.8 inventory:inventory, text:pmInventoriesText } - + var res = deepEqual(etalon, inventory) assert.ok(res, 'Сравнение инвентория распарсенного и оригинального'); render(done) @@ -1326,24 +1344,20 @@ os-controller-2.vst.lan ansible_host=10.20.0.8 syncQUnit.addTest('Импорт валидного inventory', function ( assert ) { - jsonEditor.jsonEditorRmVar('ansible_ssh_private_key_file', 'inventory') + delete inventory.vars.ansible_ssh_private_key_file for(var i in inventory.hosts) - { - var val = inventory.hosts[i] - jsonEditor.jsonEditorRmVar('ansible_ssh_private_key_file', 'host'+val.name) + { + delete inventory.hosts[i].vars.ansible_ssh_private_key_file } for(var i in inventory.groups) { - var val = inventory.groups[i] - jsonEditor.jsonEditorRmVar('ansible_ssh_private_key_file', "group"+i) - - for(var j in val.hosts) + delete inventory.groups[i].vars.ansible_ssh_private_key_file + for(var j in inventory.groups[i].hosts) { - var hval = val.hosts[j] - jsonEditor.jsonEditorRmVar('ansible_ssh_private_key_file', "host"+hval.name) + delete inventory.groups[i].hosts[j].vars.ansible_ssh_private_key_file } } - + var done = assert.async(); $("#inventory_name").val("inventory") $.when(pmInventories.importInventory(inventory)).done(function() @@ -2495,8 +2509,7 @@ window.qunitTestsArray.push(function() }); syncQUnit.addTest('Страница history 2', function ( assert ) - { - debugger; + { var done = assert.async(); if(!pmHistory.model.itemslist.results.length) From aae1d6b33779cc06597e1ff8bd57800d938bb836 Mon Sep 17 00:00:00 2001 From: Trapenok Victor Date: Tue, 24 Oct 2017 15:41:28 +1000 Subject: [PATCH 006/110] search form refactoring --- polemarch/static/js/libs/just-watch.js | 2 +- polemarch/static/js/pmItems.js | 44 ++++++++++++--- polemarch/static/js/polemarch.js | 12 ++--- polemarch/static/templates/pmGroups.html | 35 ++++++------ polemarch/static/templates/pmHistory.html | 54 +++++++++---------- polemarch/static/templates/pmHosts.html | 2 +- polemarch/static/templates/pmInventories.html | 2 +- .../static/templates/pmPeriodicTasks.html | 2 +- polemarch/static/templates/pmProjects.html | 2 +- .../static/templates/pmTasksTemplates.html | 2 +- polemarch/static/templates/pmUsers.html | 2 +- 11 files changed, 95 insertions(+), 64 deletions(-) diff --git a/polemarch/static/js/libs/just-watch.js b/polemarch/static/js/libs/just-watch.js index d93205a4..27ef3b86 100644 --- a/polemarch/static/js/libs/just-watch.js +++ b/polemarch/static/js/libs/just-watch.js @@ -538,7 +538,7 @@ var justReactive = { }); if(Array.isArray(newval.val)) - { + { Object.defineProperty(this[opt.prop], 'splice', { enumerable: false , configurable: true diff --git a/polemarch/static/js/pmItems.js b/polemarch/static/js/pmItems.js index 5dc55969..0a5deeb0 100644 --- a/polemarch/static/js/pmItems.js +++ b/polemarch/static/js/pmItems.js @@ -153,6 +153,13 @@ pmItems.validateRangeName = function(name) } +/** + * Строит страницу со списком объектоа + * @param {type} holder + * @param {type} menuInfo + * @param {type} data + * @returns {$.Deferred} + */ pmItems.showList = function(holder, menuInfo, data) { var thisObj = this; @@ -172,6 +179,10 @@ pmItems.showList = function(holder, menuInfo, data) }) } +/** + * @param {string} query + * @returns {HTML} Шаблон формы поиска + */ pmItems.searchFiled = function(options) { options.className = this.model.className; @@ -179,6 +190,11 @@ pmItems.searchFiled = function(options) return spajs.just.render('searchFiled', {opt:options}); } +/** + * Выполняет переход на страницу с результатами поиска + * @param {string} query + * @returns {$.Deferred} + */ pmItems.search = function(query, options) { if(this.isEmptySearchQuery(query)) @@ -189,6 +205,11 @@ pmItems.search = function(query, options) return spajs.open({ menuId:this.model.name+"/search/"+this.searchObjectToString(trim(query)), reopen:true}); } +/** + * Если поисковый запрос пуст то вернёт true + * @param {type} query + * @returns {Boolean} + */ pmItems.isEmptySearchQuery = function(query) { if(!query || !trim(query)) @@ -199,6 +220,13 @@ pmItems.isEmptySearchQuery = function(query) return false; } +/** + * Строит страницу результатов поиска на основе урла страницы + * @param {type} holder + * @param {type} menuInfo + * @param {type} data + * @returns {$.Deferred} + */ pmItems.showSearchResults = function(holder, menuInfo, data) { var thisObj = this; @@ -410,15 +438,19 @@ pmItems.sendSearchQuery = function(query, limit, offset) { if(!limit) { - limit = 999; + limit = 999; } if(!offset) { - offset = 0; + offset = 0; } var q = []; + + q.push("limit="+encodeURIComponent(limit)) + q.push("offset="+encodeURIComponent(offset)) + for(var i in query) { if(Array.isArray(query[i])) @@ -432,13 +464,13 @@ pmItems.sendSearchQuery = function(query, limit, offset) } q.push(encodeURIComponent(i)+"="+encodeURIComponent(query[i])) } + var thisObj = this; return spajs.ajax.Call({ - url: "/api/v1/"+this.model.name+"/filter/", - type: "POST", - contentType:'application/json', - data: JSON.stringify({filter:query}), // "limit="+encodeURIComponent(limit)+"&offset="+encodeURIComponent(offset), + url: "/api/v1/"+this.model.name+"/?"+q.join("&"), + type: "GET", + contentType:'application/json', success: function(data) { //console.log("update Items", data) diff --git a/polemarch/static/js/polemarch.js b/polemarch/static/js/polemarch.js index 44d831b0..890f4c0f 100644 --- a/polemarch/static/js/polemarch.js +++ b/polemarch/static/js/polemarch.js @@ -123,7 +123,7 @@ polemarch.start = function(options) // users spajs.addMenu({ id:"users", - urlregexp:[/^users$/, /^user$/, /^users\/page\/([0-9]+)$/], + urlregexp:[/^users$/, /^user$/, /^users\/search\/?$/, /^users\/page\/([0-9]+)$/], onOpen:function(holder, menuInfo, data){return pmUsers.showList(holder, menuInfo, data);} }) @@ -149,7 +149,7 @@ polemarch.start = function(options) // hosts spajs.addMenu({ id:"hosts", - urlregexp:[/^hosts$/, /^host$/, /^hosts\/page\/([0-9]+)$/], + urlregexp:[/^hosts$/, /^host$/, /^hosts\/search\/?$/, /^hosts\/page\/([0-9]+)$/], onOpen:function(holder, menuInfo, data){return pmHosts.showList(holder, menuInfo, data);} }) @@ -175,7 +175,7 @@ polemarch.start = function(options) // groups spajs.addMenu({ id:"groups", - urlregexp:[/^groups$/, /^group$/, /^groups\/page\/([0-9]+)$/], + urlregexp:[/^groups$/, /^group$/, /^groups\/search\/?$/, /^groups\/page\/([0-9]+)$/], onOpen:function(holder, menuInfo, data){return pmGroups.showList(holder, menuInfo, data);} }) @@ -200,7 +200,7 @@ polemarch.start = function(options) // inventories spajs.addMenu({ id:"inventories", - urlregexp:[/^inventories$/, /^inventory$/, /^inventories\/page\/([0-9]+)$/], + urlregexp:[/^inventories$/, /^inventory$/, /^inventories\/search\/?$/, /^inventories\/page\/([0-9]+)$/], onOpen:function(holder, menuInfo, data){return pmInventories.showList(holder, menuInfo, data);} }) @@ -238,7 +238,7 @@ polemarch.start = function(options) // projects spajs.addMenu({ id:"projects", - urlregexp:[/^projects$/, /^project$/, /^projects\/page\/([0-9]+)$/], + urlregexp:[/^projects$/, /^projects\/search\/?$/, /^project$/, /^projects\/page\/([0-9]+)$/], onOpen:function(holder, menuInfo, data){return pmProjects.showUpdatedList(holder, menuInfo, data);}, onClose:function(){return pmProjects.stopUpdates();}, }) @@ -301,7 +301,7 @@ polemarch.start = function(options) // history spajs.addMenu({ id:"history", - urlregexp:[/^history$/, /^history\/page\/([0-9]+)$/], + urlregexp:[/^history$/, /^history\/search\/?$/, /^history\/page\/([0-9]+)$/], onOpen:function(holder, menuInfo, data){return pmHistory.showUpdatedList(holder, menuInfo, data);}, onClose:function(){return pmHistory.stopUpdates();}, }) diff --git a/polemarch/static/templates/pmGroups.html b/polemarch/static/templates/pmGroups.html index 470c67dc..4a2c03e0 100644 --- a/polemarch/static/templates/pmGroups.html +++ b/polemarch/static/templates/pmGroups.html @@ -20,8 +20,8 @@

      - Groups - <%= pmGroups.searchFiled({query:query}) %> +
      Groups
      + <%= pmGroups.searchFiled({query:query}) %> <% if(pmGroups.getTotalPages(pmGroups.model.itemslist)){ %>

    • Delete all selected elements
    - + <% if(!query){ %>
    -
      +
      • Select all
        • @@ -218,7 +218,7 @@

        <~ pmGroups.model.items[item_id].groups > <% for(var i in pmGroups.model.items[item_id].groups){ %>
        - + <%- pmGroups.model.items[item_id].groups[i].name %> @@ -229,7 +229,7 @@

        <~ pmGroups.model.items[item_id].hosts > <% for(var i in pmGroups.model.items[item_id].hosts){ %>
        - + <%- pmGroups.model.items[item_id].hosts[i].name %> @@ -395,32 +395,31 @@

        - \ No newline at end of file diff --git a/polemarch/static/templates/pmHistory.html b/polemarch/static/templates/pmHistory.html index 45cc6a52..d5d64152 100644 --- a/polemarch/static/templates/pmHistory.html +++ b/polemarch/static/templates/pmHistory.html @@ -16,8 +16,8 @@

        - History - <%= pmHistory.searchFiled({query:query}) %> +
        History
        + <%= pmHistory.searchFiled({query:query}) %> <% if(pmHistory.getTotalPages(pmHistory.model.itemslist)){ %> - + @@ -22,9 +22,10 @@ + - + @@ -35,8 +36,8 @@ - + {% endblock %} {% block script %} @@ -46,6 +47,7 @@ var templates = [ 'templates/jsonEditor', 'templates/crontabEditor', + 'templates/filedsLib', 'templates/pmItems', 'templates/pmDashboard', 'templates/pmGroups', diff --git a/polemarch/static/js/common.js b/polemarch/static/js/common.js index 49229417..b1473067 100644 --- a/polemarch/static/js/common.js +++ b/polemarch/static/js/common.js @@ -83,3 +83,21 @@ function trim(s) return ''; } + +function inheritance(obj, constructor) +{ + var object = undefined; + var item = function() + { + if(constructor) + { + return constructor.apply(jQuery.extend(true, item, object), arguments); + } + + return jQuery.extend(true, item, object); + } + + object = jQuery.extend(true, item, obj) + + return object +} diff --git a/polemarch/static/js/jsonEditor.js b/polemarch/static/js/jsonEditor.js index 3cb7b951..77a81343 100644 --- a/polemarch/static/js/jsonEditor.js +++ b/polemarch/static/js/jsonEditor.js @@ -8,6 +8,7 @@ jsonEditor.model.isLoaded_cli_reference = false; jsonEditor.model.isLoading_cli_reference = false; jsonEditor.options = {}; +jsonEditor.model.form = {} jsonEditor.options['item'] = {} @@ -195,9 +196,12 @@ jsonEditor.editor = function(json, opt) { opt.prefix = 'prefix' } - + opt.prefix = opt.prefix.replace(/[^A-z0-9]/g, "_").replace(/[\[\]]/gi, "_") jsonEditor.model.data[opt.prefix] = json; + jsonEditor.model.form[opt.prefix] = { + showImportForm:false + }; return spajs.just.render('jsonEditor', {data:json, optionsblock:opt.block, opt:opt}) } @@ -225,7 +229,7 @@ jsonEditor.jsonEditorGetValues = function(prefix) { return {} } - + return jsonEditor.model.data[prefix]; /*var data = {} @@ -292,11 +296,142 @@ jsonEditor.__devAddVar = function(name, value, optionsblock, prefix) jsonEditor.model.data[prefix][name] = value $("#jsonEditorVarList"+prefix).appendTpl(spajs.just.render('jsonEditorLine', {name:name, value:value, optionsblock:optionsblock, opt:{prefix:prefix}})) $("#jsonEditorVarListHolder"+prefix).show() - + tabSignal.emit(prefix+".jsonEditorUpdate",{name:name, value:value, prefix:prefix}) tabSignal.emit("jsonEditorUpdate",{name:name, value:value, prefix:prefix}) } +/** + * Делает импорт переменных из формата инвентория + */ +jsonEditor.jsonEditorImportVars = function(optionsblock, prefix) +{ + if(!prefix) + { + prefix = "prefix" + } + prefix = prefix.replace(/[^A-z0-9]/g, "_").replace(/[\[\]]/gi, "_") + + if(!optionsblock) + { + optionsblock = 'base' + } + + var varsText = $('#new_json_vars'+prefix).val() + var vars = varsText.split(/\n/gm) + var varsresult = {} + + for(var i in vars) + { + if(/^[\s \t]*$/.test(vars[i])) + { + continue; + } + + var res = jsonEditor.parseMonoVarsLine(i, vars[i]) + if(res !== false) + { + + if($("#json_"+res.name.replace(/[^A-z0-9]/g, "_").replace(/[\[\]]/gi, "_")+"_value"+prefix).length) + { + $.notify("Var `"+res.name+"` already exists", "error"); + continue; + } + + if(/^-[A-z0-9]$/.test(res.name)) + { + for(var i in jsonEditor.options[optionsblock]) + { + if("-"+jsonEditor.options[optionsblock][i].alias == res.name) + { + val.name = i + break; + } + } + } + + if(optionsblock && jsonEditor.options[optionsblock] && jsonEditor.options[optionsblock][res.name]) + { + var optInfo = jsonEditor.options[optionsblock][res.name] + if(optInfo.type == 'error') + { + $.notify("Adding this variable will be the mistake", "error"); + continue; + } + } + + varsText = varsText.replace(vars[i], "") + varsresult[res.name] = res.value + } + } + $('#new_json_vars'+prefix).val(varsText) + + console.log(varsresult) + + var opt = { + prefix:prefix + } + + for(var i in varsresult) + { + var val = varsresult[i] + + jsonEditor.model.data[prefix][i] = val + $("#jsonEditorVarList"+prefix).appendTpl(spajs.just.render('jsonEditorLine', {name:i, value:val, optionsblock:optionsblock, opt:opt})) + $("#jsonEditorVarListHolder"+prefix).show() + + tabSignal.emit(prefix+".jsonEditorUpdate",{name:i, value:val, prefix:prefix}) + tabSignal.emit("jsonEditorUpdate",{name:i, value:val, prefix:prefix}) + } +} + +/** + * Парсит данные для импорта переменных из формата инвентория + * + * + * Параметры из секции *:vars + * Строка где после первого `=` всё остальное значение. + */ +jsonEditor.parseMonoVarsLine = function(index, line) +{ + var vars = {} + var param = /^([^=]+)="(.*)"$/.exec(line) + + if(param) + { + vars.name = param[1] + vars.value = param[2] + } + else + { + param = /^([^=]+)=(.*)$/.exec(line) + if(param) + { + vars.name = param[1] + vars.value = param[2] + } + else + { + param = /^([^:]+):(.*)$/.exec(line) + if(param) + { + vars.name = param[1] + vars.value = param[2] + } + else + { + return false; + //throw "Error in line "+index+" invalid varibles string ("+line+")" + } + } + } + vars.name = trim(vars.name) + vars.value = trim(vars.value) + + return vars; +} + + jsonEditor.jsonEditorAddVar = function(optionsblock, prefix) { if(!prefix) @@ -319,7 +454,7 @@ jsonEditor.jsonEditorAddVar = function(optionsblock, prefix) return; } - if($("#json_"+name+"_value"+prefix).length) + if($("#json_"+name.replace(/[^A-z0-9]/g, "_").replace(/[\[\]]/gi, "_")+"_value"+prefix).length) { $.notify("This var already exists", "error"); return; @@ -357,7 +492,7 @@ jsonEditor.jsonEditorAddVar = function(optionsblock, prefix) jsonEditor.model.data[prefix][name] = value $("#jsonEditorVarList"+prefix).appendTpl(spajs.just.render('jsonEditorLine', {name:name, value:value, optionsblock:optionsblock, opt:opt})) $("#jsonEditorVarListHolder"+prefix).show() - + tabSignal.emit(prefix+".jsonEditorUpdate",{name:name, value:value, prefix:prefix}) tabSignal.emit("jsonEditorUpdate",{name:name, value:value, prefix:prefix}) } @@ -410,22 +545,22 @@ jsonEditor.initAutoComplete = function(optionsblock, prefix) } jsonEditor.sortFunction = function(a, b) -{ +{ a = a.value b = b.value for(var i in a) { if(b.length <= i) - { + { return 1; } if(a.charCodeAt(i) != b.charCodeAt(i)) - { + { return a.charCodeAt(i) - b.charCodeAt(i) } } - + return 0; } diff --git a/polemarch/static/js/libs/just-watch.js b/polemarch/static/js/libs/just-watch.js index 27ef3b86..7d79e804 100644 --- a/polemarch/static/js/libs/just-watch.js +++ b/polemarch/static/js/libs/just-watch.js @@ -780,8 +780,13 @@ Object.defineProperty(Object.prototype, "justClassName", { }]) } }); - -// Проставляет атрибут (односторонний биндинг от модели в дом элементы) + +/** + * Проставляет атрибут (односторонний биндинг от модели в дом элементы) + * @example <%= pmUsers.model.items[item_id].justAttr('username', 'value') %> + * @param {String} name имя свойства объекта + * @param {String} name имя атрибута html тега + */ Object.defineProperty(Object.prototype, "justAttr", { enumerable: false , configurable: true diff --git a/polemarch/static/js/libs/just.js b/polemarch/static/js/libs/just.js index 77783fdb..ece577c6 100644 --- a/polemarch/static/js/libs/just.js +++ b/polemarch/static/js/libs/just.js @@ -96,7 +96,7 @@ STATE_JS = 11, cache = {}, countUid = 0, - + regExpEscape = function (str) { return String(str).replace(escapeExp, '\\$1'); }, @@ -360,7 +360,7 @@ return data; } else { console.error('Failed to load template', file) - return ''; + throw 'Failed to load template ' + file } }, loadSync = function (file) { @@ -451,14 +451,6 @@ data = {} } - if(this.record) - { - this.testrecord.push({ - template:template, - data:data - }) - } - var tpl = new Template(template, data); var html = tpl.renderSync(); if(html == undefined) @@ -469,54 +461,16 @@ }; this.render = this.renderSync + this.isTplExists = function(name){ + return options.root[name] !== undefined + } /** * При вставке этого html в дом дерево будет выполнена функция func * @param {type} html * @param {type} func * @returns {unresolved} */ - this.onInsert = onInsert - - // Начинает сохранение данных о отрисовываемых шаблонов - this.startRecoding = function () - { - this.record = true; - this.testrecord = [] - } - - // Возвращяет данные о отрисованых шаблонах - this.getRecoding = function () - { - return this.testrecord - } - - // Заканчивает сохранение данных о отрисовываемых шаблонов - this.stopRecoding = function () - { - this.record = false; - } - - // Берёт результат записи данных из getRecoding и прогоняет рендер ещё раз - // Если возникнут ошибки то выведет их вконсоль - // Удобно использовать для автоматизации проверки валидности шаблонов и передаваемых в них данных. - this.testRecoding = function (record) - { - var tmp = this.record; - this.record = false; - - for(var i in record) - { - console.log(i, record[i].template); - var res = this.renderSync(record[i].template, record[i].data) - if(!res) - { - console.error(i, record[i].template, record[i].data); - } - - } - this.record = tmp; - } - + this.onInsert = onInsert this.configure(newOptions); }; diff --git a/polemarch/static/js/pmDashboard.js b/polemarch/static/js/pmDashboard.js index 82d48130..7c8a8468 100644 --- a/polemarch/static/js/pmDashboard.js +++ b/polemarch/static/js/pmDashboard.js @@ -17,6 +17,48 @@ pmDashboard.model.count = { history:'-', } +/** + * Двумерный массив с описанием списка отображаемых виджетов в каждой строке + * + * @example + * [ + * [{ + name:'pmwTemplatesCounter', // Имя класса виджета + opt:{}, // Опции для виджета + }] + ] + * + * @type Array + */ +pmDashboard.model.widgets = [ + [ + { + name:'pmwTemplatesCounter', + opt:{}, + }, + { + name:'pmwProjectsCounter', + opt:{}, + }, + { + name:'pmwInventoriesCounter', + opt:{}, + }, + { + name:'pmwHostsCounter', + opt:{}, + }, + { + name:'pmwGroupsCounter', + opt:{}, + }, + { + name:'pmwUsersCounter', + opt:{}, + }, /**/ + ], +] + pmDashboard.stopUpdates = function() { clearTimeout(this.model.updateTimeoutId) @@ -25,30 +67,7 @@ pmDashboard.stopUpdates = function() pmDashboard.updateData = function() { - var thisObj = this - $.when(pmProjects.loadItems(1)).done(function(){ - thisObj.model.count.projects = pmProjects.model.itemslist.count; - }) - - $.when(pmInventories.loadItems(1)).done(function(){ - thisObj.model.count.inventories = pmInventories.model.itemslist.count; - }) - - $.when(pmHosts.loadItems(1)).done(function(){ - thisObj.model.count.hosts = pmHosts.model.itemslist.count; - }) - - $.when(pmGroups.loadItems(1)).done(function(){ - thisObj.model.count.groups = pmGroups.model.itemslist.count; - }) - - $.when(pmUsers.loadItems(1)).done(function(){ - thisObj.model.count.users = pmUsers.model.itemslist.count; - }) - - $.when(pmTemplates.loadItems(1)).done(function(){ - thisObj.model.count.templates = pmTemplates.model.itemslist.count; - }) + var thisObj = this var startTime = moment().subtract(14, 'days').format("YYYY-MM-DD")+"T00:00:00.000000Z" $.when(pmHistory.sendSearchQuery({start_time__gt:startTime})).done(function() @@ -110,7 +129,21 @@ pmDashboard.updateData = function() pmDashboard.open = function(holder, menuInfo, data) { + var thisObj = this + + // Инициализация всех виджетов на странице + for(var i in pmDashboard.model.widgets) + { + for(var j in pmDashboard.model.widgets[i]) + { + if(pmDashboard.model.widgets[i][j].widget === undefined) + { + pmDashboard.model.widgets[i][j].widget = new window[pmDashboard.model.widgets[i][j]['name']](pmDashboard.model.widgets[i][j].opt); + } + } + } + this.updateData() $(holder).insertTpl(spajs.just.render('dashboard_page', {})) @@ -137,4 +170,96 @@ pmDashboard.open = function(holder, menuInfo, data) } } }); -} \ No newline at end of file +} + +tabSignal.connect("polemarch.start", function() +{ + spajs.addMenu({ + id:"home", + urlregexp:[/^(home|)$/], + onOpen:function(holder, menuInfo, data){return pmDashboard.open(holder, menuInfo, data);}, + onClose:function(){return pmDashboard.stopUpdates();}, + }) + +}) + +/** + * Базовый класс виджета + * @type Object + */ +pmDashboardWidget = { + id:'', + model:{ + test:1 + }, + render:function(){ + + }, + init:function(opt){ + mergeDeep(this.model, opt) + } +} + +/** + * Базовый класс виджета показывающего количество элементов + * @type Object + */ +var pmwItemsCounter = inheritance(pmDashboardWidget) + +pmwItemsCounter.model.count = '-' +pmwItemsCounter.model.countObject = 'pmItems' +pmwItemsCounter.render = function() +{ + var thisObj = this; + var html = spajs.just.render('pmwItemsCounter', {model:this.model}) + return window.JUST.onInsert(html, function() + { + $.when(window[thisObj.model.countObject].loadItems(1)).done(function() + { + thisObj.model.count = window[thisObj.model.countObject].model.itemslist.count; + }) + }) +} + +/** + * Класс виджета показывающий количество хостов + * @type Object + */ +var pmwHostsCounter = inheritance(pmwItemsCounter) +pmwHostsCounter.model.countObject = 'pmHosts' + +/** + * Класс виджета показывающий количество шаблонов + * @type Object + */ +var pmwTemplatesCounter = inheritance(pmwItemsCounter) +pmwTemplatesCounter.model.countObject = 'pmTemplates' + +/** + * Класс виджета показывающий количество групп + * @type Object + */ +var pmwGroupsCounter = inheritance(pmwItemsCounter) +pmwGroupsCounter.model.countObject = 'pmGroups' + +/** + * Класс виджета показывающий количество проектов + * @type Object + */ +var pmwProjectsCounter = inheritance(pmwItemsCounter) +pmwProjectsCounter.model.countObject = 'pmProjects' + +/** + * Класс виджета показывающий количество инвенториев + * @type Object + */ +var pmwInventoriesCounter = inheritance(pmwItemsCounter) +pmwInventoriesCounter.model.countObject = 'pmInventories' + +/** + * Класс виджета показывающий количество пользователей + * @type Object + */ +var pmwUsersCounter = inheritance(pmwItemsCounter) +pmwUsersCounter.model.countObject = 'pmUsers' + \ No newline at end of file diff --git a/polemarch/static/js/pmGroups.js b/polemarch/static/js/pmGroups.js index 499d98d8..6ace3080 100644 --- a/polemarch/static/js/pmGroups.js +++ b/polemarch/static/js/pmGroups.js @@ -217,6 +217,10 @@ pmGroups.setSubGroups = function(item_id, groups_ids) pmGroups.model.items[item_id].groups = [] for(var i in groups_ids) { + if(!pmGroups.model.items[groups_ids[i]]) + { + continue; + } pmGroups.model.items[item_id].groups.push(pmGroups.model.items[groups_ids[i]]) } } @@ -252,6 +256,10 @@ pmGroups.setSubHosts = function(item_id, hosts_ids) pmGroups.model.items[item_id].hosts = [] for(var i in hosts_ids) { + if(!pmHosts.model.items[hosts_ids[i]]) + { + continue; + } pmGroups.model.items[item_id].hosts.push(pmHosts.model.items[hosts_ids[i]]) } } @@ -371,7 +379,7 @@ pmGroups.addSubHosts = function(item_id, hosts_ids) * Показывает форму со списком всех групп. * @return $.Deferred */ -pmGroups.showAddSubGroupsForm = function(item_id, holder) +pmGroups.showAddSubGroupsForm = function(item_id) { return $.when(pmGroups.loadAllItems()).done(function(){ $("#add_existing_item_to_group").remove() @@ -386,7 +394,7 @@ pmGroups.showAddSubGroupsForm = function(item_id, holder) * Показывает форму со списком всех хостов. * @return $.Deferred */ -pmGroups.showAddSubHostsForm = function(item_id, holder) +pmGroups.showAddSubHostsForm = function(item_id) { return $.when(pmHosts.loadAllItems()).done(function(){ $("#add_existing_item_to_group").remove() @@ -506,124 +514,157 @@ pmGroups.groupsAutocompleteTemplate = function(inventory_id, value, prefix) var value = $(item).attr('data-value'); $("#groups_autocomplete_filed"+prefix).val(value); }, - source: function(original_term, response) - { - var addTermToMatches = false - var term = original_term - var baseTerm = "" - if(original_term.indexOf(':') >= 0) - { - addTermToMatches = true - term = original_term.replace(/^(.*):([^:]*)$/gim, "$2") - baseTerm = original_term.replace(/^(.*):([^:]*)$/gim, "$1:") - } - - if(term[0] == '!') - { - term = term.substring(1) - baseTerm = baseTerm + "!" - } - - var arrUsedItems = original_term.toLowerCase().replace(/!/gmi, "").split(/:/g) - - term = term.toLowerCase(); + source: function(original_term, response){ + pmGroups.groupsAutocompleteMatcher(original_term, response, inventory_id) + } + }); + }) + } + + return spajs.just.render('groups_autocomplete_filed', {selectedInventory:inventory_id, value:value, prefix:prefix}) +} - var matches = [] - var matchesAll = [] +pmGroups.groupsAutocompleteMatcher = function(original_term, response, inventory_id) +{ + var addTermToMatches = false + var term = original_term + var baseTerm = "" + if(original_term.indexOf(':') >= 0) + { + addTermToMatches = true + term = original_term.replace(/^(.*):([^:]*)$/gim, "$2") + baseTerm = original_term.replace(/^(.*):([^:]*)$/gim, "$1:") + } - for(var i in pmInventories.model.items[inventory_id].groups) - { - var val = pmInventories.model.items[inventory_id].groups[i] - - if($.inArray(val.name.toLowerCase(), arrUsedItems) != -1) - { - continue; - } - - var text = val.name - if(addTermToMatches) - { - text = baseTerm+text - } - - if(val.name.toLowerCase().indexOf(term) == 0 ) - { - matches.push({ - value:text, - isHost:false, - name:val.name, - }) - } - - matchesAll.push({ - value:text, - isHost:false, - name:val.name, - }) - } + if(term[0] == '!') + { + term = term.substring(1) + baseTerm = baseTerm + "!" + } - for(var i in pmInventories.model.items[inventory_id].hosts) - { - var val = pmInventories.model.items[inventory_id].hosts[i] - if($.inArray(val.name.toLowerCase(), arrUsedItems) != -1) - { - continue; - } - - if(val.name.indexOf(":") != -1) - { - continue; - } - - var text = val.name - if(addTermToMatches) - { - text = baseTerm+text - } - - if(val.name.toLowerCase().indexOf(term) == 0 ) - { - matches.push({ - value:text, - isHost:true, - name:val.name, - }) - } - - matchesAll.push({ - value:text, - isHost:true, - name:val.name, - }) - } - - if(!addTermToMatches && "All".toLowerCase().indexOf(term) != -1 ) - { - matches.push({ - value:"all", - isHost:false, - name:"all", - }) - - matchesAll.push({ - value:"all", - isHost:false, - name:"all", - }) - } + var arrUsedItems = original_term.toLowerCase().replace(/!/gmi, "").split(/:/g) - if(matches.length > 1 || addTermToMatches) - { - response(matches); - } - else - { - response(matchesAll) - } - } - }); + term = term.toLowerCase(); + + var matches = [] + var matchesAll = [] + + for(var i in pmInventories.model.items[inventory_id].groups) + { + var val = pmInventories.model.items[inventory_id].groups[i] + + if($.inArray(val.name.toLowerCase(), arrUsedItems) != -1) + { + continue; + } + + var text = val.name + if(addTermToMatches) + { + text = baseTerm+text + } + + if(val.name.toLowerCase().indexOf(term) == 0 ) + { + matches.push({ + value:text, + isHost:false, + name:val.name, + }) + } + + matchesAll.push({ + value:text, + isHost:false, + name:val.name, + }) + } + + for(var i in pmInventories.model.items[inventory_id].hosts) + { + var val = pmInventories.model.items[inventory_id].hosts[i] + if($.inArray(val.name.toLowerCase(), arrUsedItems) != -1) + { + continue; + } + + if(val.name.indexOf(":") != -1) + { + continue; + } + + var text = val.name + if(addTermToMatches) + { + text = baseTerm+text + } + + if(val.name.toLowerCase().indexOf(term) == 0 ) + { + matches.push({ + value:text, + isHost:true, + name:val.name, + }) + } + + matchesAll.push({ + value:text, + isHost:true, + name:val.name, + }) + } + + if(!addTermToMatches && "All".toLowerCase().indexOf(term) != -1 ) + { + matches.push({ + value:"all", + isHost:false, + name:"all", }) + + matchesAll.push({ + value:"all", + isHost:false, + name:"all", + }) + } + + if(matches.length > 1 || addTermToMatches) + { + response(matches); } + else + { + response(matchesAll) + } +} + +tabSignal.connect("polemarch.start", function() +{ + // groups + spajs.addMenu({ + id:"groups", + urlregexp:[/^groups$/, /^group$/, /^groups\/search\/?$/, /^groups\/page\/([0-9]+)$/], + onOpen:function(holder, menuInfo, data){return pmGroups.showList(holder, menuInfo, data);} + }) + + spajs.addMenu({ + id:"groups-search", + urlregexp:[/^groups\/search\/([A-z0-9 %\-.:,=]+)$/], + onOpen:function(holder, menuInfo, data){return pmGroups.showSearchResults(holder, menuInfo, data);} + }) + + spajs.addMenu({ + id:"group", + urlregexp:[/^group\/([0-9]+)$/, /^groups\/([0-9]+)$/], + onOpen:function(holder, menuInfo, data){return pmGroups.showItem(holder, menuInfo, data);} + }) + + spajs.addMenu({ + id:"newGroup", + urlregexp:[/^new-group$/, /^([A-z0-9_]+)\/([0-9]+)\/new-group$/], + onOpen:function(holder, menuInfo, data){return pmGroups.showNewItemPage(holder, menuInfo, data);} + }) - return spajs.just.render('groups_autocomplete_filed', {selectedInventory:inventory_id, value:value, prefix:prefix}) -} \ No newline at end of file +}) \ No newline at end of file diff --git a/polemarch/static/js/pmHistory.js b/polemarch/static/js/pmHistory.js index eb0ffd13..a803de40 100644 --- a/polemarch/static/js/pmHistory.js +++ b/polemarch/static/js/pmHistory.js @@ -38,7 +38,7 @@ pmHistory.showSearchResults = function(holder, menuInfo, data) }) } -pmPeriodicTasks.search = function(query, options) +pmHistory.search = function(query, options) { if(options.inventory_id) { @@ -619,3 +619,61 @@ pmHistory.loadLines = function(item_id, opt) return def.promise(); } + + tabSignal.connect("polemarch.start", function() + { + // history + spajs.addMenu({ + id:"history", + urlregexp:[/^history$/, /^history\/search\/?$/, /^history\/page\/([0-9]+)$/], + onOpen:function(holder, menuInfo, data){return pmHistory.showUpdatedList(holder, menuInfo, data);}, + onClose:function(){return pmHistory.stopUpdates();}, + }) + + spajs.addMenu({ + id:"history-search", + urlregexp:[/^history\/search\/([A-z0-9 %\-.:,=]+)$/], + onOpen:function(holder, menuInfo, data){return pmHistory.showSearchResults(holder, menuInfo, data);} + }) + + spajs.addMenu({ + id:"history-item", + urlregexp:[/^history\/([0-9]+)$/], + onOpen:function(holder, menuInfo, data){return pmHistory.showItem(holder, menuInfo, data);}, + onClose:function(){return pmHistory.stopUpdates();} + }) + + spajs.addMenu({ + id:"history-item-in-project", + urlregexp:[/^project\/([0-9]+)\/history\/([0-9]+)$/], + onOpen:function(holder, menuInfo, data){return pmHistory.showItemInProjects(holder, menuInfo, data);}, + onClose:function(){return pmHistory.stopUpdates();} + }) + + spajs.addMenu({ + id:"project-history", + urlregexp:[/^project\/([0-9]+)\/history$/, /^project\/([0-9]+)\/history\/page\/([0-9]+)$/], + onOpen:function(holder, menuInfo, data){ + return pmHistory.showUpdatedList(holder, menuInfo, data, "showListInProjects", function(menuInfo, data) + { + var offset = 0 + var limit = pmHistory.pageSize; + if(data.reg && data.reg[2] > 0) + { + offset = pmHistory.pageSize*(data.reg[2] - 1); + } + var project_id = data.reg[1]; + + return pmHistory.sendSearchQuery({project:project_id}, limit, offset) + }); + }, + onClose:function(){return pmHistory.stopUpdates();}, + }) + + spajs.addMenu({ + id:"project-history-search", + urlregexp:[/^project\/([0-9]+)\/history\/search\/([A-z0-9 %\-.:,=]+)$/], + onOpen:function(holder, menuInfo, data){return pmHistory.showSearchResultsInProjects(holder, menuInfo, data);} + }) + + }) \ No newline at end of file diff --git a/polemarch/static/js/pmHosts.js b/polemarch/static/js/pmHosts.js index 2b4c0f14..4e37505e 100644 --- a/polemarch/static/js/pmHosts.js +++ b/polemarch/static/js/pmHosts.js @@ -5,6 +5,109 @@ pmHosts.model.name = "hosts" pmHosts.model.page_name = "host" pmHosts.model.className = "pmHosts" +pmHosts.model.page_list = { + title: "Hosts", + short_title: "Hosts", + fileds:[ + { + title:'Name', + name:'name', + }, + { + title:'Type', + name:'type', + style:function(item){ return 'style="width: 70px"'}, + class:function(item){ return 'class="hidden-xs"'}, + } + ], + actions:[ + { + class:'btn btn-danger', + function:function(item){ return 'spajs.showLoader('+this.model.className+'.deleteItem('+item.id+'));'}, + title:'Delete', + link:function(){ return '#'} + } + ] +} + + +pmHosts.fileds = [ + [ + { + filed: new filedsLib.filed.text(), + title:'Name', + name:'name', + placeholder:'Enter host or range name', + help:'Host or range name', + validator:function(value){ return this.validateRangeName(value) || this.validateHostName(value)}, + fast_validator:function(value){ return this.validateRangeName(value) || this.validateHostName(value)} + }, + ] +] + +pmHosts.model.page_new = { + title: "New host", + short_title: "New host", + fileds:pmHosts.fileds, + sections:[ + function(section){ + return jsonEditor.editor({}, {block:this.model.name}); + } + ], + onBeforeSave:function(data) + { + data.vars = jsonEditor.jsonEditorGetValues() + return data; + }, + onCreate:function(result) + { + var def = new $.Deferred(); + $.notify("Host created", "success"); + $.when(spajs.open({ menuId:pmHosts.model.page_name+"/"+result.id})).always(function(){ + def.resolve() + }) + + return def.promise(); + } +} + +pmHosts.model.page_item = { + sections:[ + function(section, item_id){ + return jsonEditor.editor(this.model.items[item_id].vars, {block:this.model.name}); + } + ], + title: function(item_id){ + return "Host "+pmHosts.model.items[item_id].justText('name') + }, + short_title: function(item_id){ + return "Host "+pmHosts.model.items[item_id].justText('name', function(v){return v.slice(0, 20)}) + }, + fileds:pmHosts.fileds, + onUpdate:function(result) + { + return true; + }, + onBeforeSave:function(data, item_id) + { + data.vars = jsonEditor.jsonEditorGetValues() + if(this.validateHostName(data.name)) + { + data.type = 'HOST' + } + else if(this.validateRangeName(data.name)) + { + data.type = 'RANGE' + } + else + { + $.notify("Error in host or range name", "error"); + return undefined; + } + return data; + }, +} + pmHosts.copyItem = function(item_id) { var def = new $.Deferred(); @@ -37,137 +140,7 @@ pmHosts.copyItem = function(item_id) return def.promise(); } - -/** - * @return $.Deferred - */ -pmHosts.addItem = function(parent_type, parent_item) -{ - var def = new $.Deferred(); - - var data = {} - - data.name = $("#new_host_name").val() - data.type = $("#new_host_type").val() - data.vars = jsonEditor.jsonEditorGetValues() - - if(data.type == "HOST" && (!data.name || !this.validateHostName(data.name))) - { - $.notify("Invalid value in field name", "error"); - return; - } - else if(data.type == "RANGE" && (!data.name || !this.validateRangeName(data.name))) - { - $.notify("Invalid value in field name", "error"); - return; - } - - spajs.ajax.Call({ - url: "/api/v1/"+this.model.name+"/", - type: "POST", - contentType:'application/json', - data: JSON.stringify(data), - success: function(data) - { - $.notify("Host created", "success"); - - if(parent_item) - { - if(parent_type == 'group') - { - $.when(pmGroups.addSubHosts(parent_item, [data.id])).always(function(){ - $.when(spajs.open({ menuId:"group/"+parent_item})).always(function(){ - def.resolve() - }) - }) - } - else if(parent_type == 'inventory') - { - $.when(pmInventories.addSubHosts(parent_item, [data.id])).always(function(){ - $.when(spajs.open({ menuId:"inventory/"+parent_item})).always(function(){ - def.resolve() - }) - }) - } - else if(parent_type == 'project') - { - $.when(pmProjects.addSubHosts(parent_item, [data.id])).always(function(){ - $.when(spajs.open({ menuId:"project/"+parent_item})).always(function(){ - def.resolve() - }) - }) - } - else - { - console.error("Не известный parent_type", parent_type) - $.when(spajs.open({ menuId:"host/"+data.id})).always(function(){ - def.resolve() - }) - } - } - else - { - $.when(spajs.open({ menuId:"host/"+data.id})).always(function(){ - def.resolve() - }) - } - - }, - error:function(e) - { - polemarch.showErrors(e.responseJSON) - def.reject() - } - }); - return def.promise(); -} - -/** - * @return $.Deferred - */ -pmHosts.updateItem = function(item_id) -{ - var data = {} - - data.name = $("#host_"+item_id+"_name").val() - data.type = $("#host_"+item_id+"_type").val() - data.vars = jsonEditor.jsonEditorGetValues() - - // @todo Добавить валидацию диапазонов "127.0.1.[5:6]" и 127.0.1.1, 127.0.1.2 - if(data.type == 'HOST') - { - if(!data.name || !this.validateHostName(data.name) ) - { - $.notify("Invalid value in field name", "error"); - return; - } - } - else - { - if(!data.name || !this.validateRangeName(data.name) ) - { - $.notify("Invalid value in field name", "error"); - return; - } - } - - var thisObj = this; - return spajs.ajax.Call({ - url: "/api/v1/"+this.model.name+"/"+item_id+"/", - type: "PATCH", - contentType:'application/json', - data:JSON.stringify(data), - success: function(data) - { - thisObj.model.items[item_id] = data - $.notify("Save", "success"); - }, - error:function(e) - { - polemarch.showErrors(e.responseJSON) - } - }); -} + /* * @@ -187,4 +160,32 @@ setTimeout(function(){ }) }, i*400); } - */ \ No newline at end of file + */ + + tabSignal.connect("polemarch.start", function() + { + // hosts + spajs.addMenu({ + id:"hosts", + urlregexp:[/^hosts$/, /^host$/, /^hosts\/search\/?$/, /^hosts\/page\/([0-9]+)$/], + onOpen:function(holder, menuInfo, data){return pmHosts.showList(holder, menuInfo, data);} + }) + + spajs.addMenu({ + id:"hosts-search", + urlregexp:[/^hosts\/search\/([A-z0-9 %\-.:,=]+)$/], + onOpen:function(holder, menuInfo, data){return pmHosts.showSearchResults(holder, menuInfo, data);} + }) + + spajs.addMenu({ + id:"host", + urlregexp:[/^host\/([0-9]+)$/, /^hosts\/([0-9]+)$/], + onOpen:function(holder, menuInfo, data){return pmHosts.showItem(holder, menuInfo, data);} + }) + + spajs.addMenu({ + id:"newHost", + urlregexp:[/^new-host$/, /^([A-z0-9_]+)\/([0-9]+)\/new-host$/], + onOpen:function(holder, menuInfo, data){return pmHosts.showNewItemPage(holder, menuInfo, data);} + }) + }) \ No newline at end of file diff --git a/polemarch/static/js/pmInventories.js b/polemarch/static/js/pmInventories.js index 141e6b8d..c615d7ed 100644 --- a/polemarch/static/js/pmInventories.js +++ b/polemarch/static/js/pmInventories.js @@ -1215,3 +1215,44 @@ pmInventories.validateGroupName = function(name) return false; } + + tabSignal.connect("polemarch.start", function() + { + // inventories + spajs.addMenu({ + id:"inventories", + urlregexp:[/^inventories$/, /^inventory$/, /^inventories\/search\/?$/, /^inventories\/page\/([0-9]+)$/], + onOpen:function(holder, menuInfo, data){return pmInventories.showList(holder, menuInfo, data);} + }) + + spajs.addMenu({ + id:"inventories-import", + urlregexp:[/^inventories\/import$/], + onOpen:function(holder, menuInfo, data){return pmInventories.showImportPage(holder, menuInfo, data);} + }) + + + spajs.addMenu({ + id:"inventories-search", + urlregexp:[/^inventories\/search\/([A-z0-9 %\-.:,=]+)$/], + onOpen:function(holder, menuInfo, data){return pmInventories.showSearchResults(holder, menuInfo, data);} + }) + + spajs.addMenu({ + id:"inventory", + urlregexp:[/^inventory\/([0-9]+)$/, /^inventories\/([0-9]+)$/], + onOpen:function(holder, menuInfo, data){return pmInventories.showItem(holder, menuInfo, data);} + }) + + spajs.addMenu({ + id:"inventory-history", + urlregexp:[/^inventory\/([0-9]+)\/history$/, /^inventory\/([0-9]+)\/history\/page\/([0-9]+)$/], + onOpen:function(holder, menuInfo, data){return pmHistory.showListInInventory(holder, menuInfo, data);} + }) + + spajs.addMenu({ + id:"newInventory", + urlregexp:[/^new-inventory$/, /^([A-z0-9_]+)\/([0-9]+)\/new-inventory$/], + onOpen:function(holder, menuInfo, data){return pmInventories.showNewItemPage(holder, menuInfo, data);} + }) + }) \ No newline at end of file diff --git a/polemarch/static/js/pmItems.js b/polemarch/static/js/pmItems.js index 44446f34..126c88ba 100644 --- a/polemarch/static/js/pmItems.js +++ b/polemarch/static/js/pmItems.js @@ -1,10 +1,4 @@ -function inheritance(obj) -{ - var item = jQuery.extend(true, {}, obj) - return item -} - function pmItems() { @@ -16,10 +10,14 @@ pmItems.model.selectedItems = {}; pmItems.model.itemslist = [] pmItems.model.items = {} +pmItems.model.items_permissions = {} pmItems.model.name = "based" pmItems.model.page_name = "based" pmItems.model.selectedCount = 0; -pmItems.model.className = "pmItems" +pmItems.model.className = "pmItems" + +pmItems.filed = {} + pmItems.toggleSelect = function(item_id, mode) { @@ -172,7 +170,13 @@ pmItems.showList = function(holder, menuInfo, data) return $.when(this.loadItems(limit, offset)).done(function() { - $(holder).insertTpl(spajs.just.render(thisObj.model.name+'_list', {query:""})) + var tpl = thisObj.model.name+'_list' + if(!spajs.just.isTplExists(tpl)) + { + tpl = 'items_list' + } + + $(holder).insertTpl(spajs.just.render(tpl, {query:"", pmObj:thisObj})) }).fail(function() { $.notify("", "error"); @@ -232,7 +236,13 @@ pmItems.showSearchResults = function(holder, menuInfo, data) var thisObj = this; return $.when(this.sendSearchQuery(this.searchStringToObject(decodeURIComponent(data.reg[1])))).done(function() { - $(holder).insertTpl(spajs.just.render(thisObj.model.name+'_list', {query:decodeURIComponent(data.reg[1])})) + var tpl = thisObj.model.name+'_list' + if(!spajs.just.isTplExists(tpl)) + { + tpl = 'items_list' + } + + $(holder).insertTpl(spajs.just.render(tpl, {query:decodeURIComponent(data.reg[1]), pmObj:thisObj})) }).fail(function() { $.notify("", "error"); @@ -324,7 +334,13 @@ pmItems.showItem = function(holder, menuInfo, data) return $.when(this.loadItem(data.reg[1])).done(function() { - $(holder).insertTpl(spajs.just.render(thisObj.model.name+'_page', {item_id:data.reg[1], project_id:0})) + var tpl = thisObj.model.name+'_page' + if(!spajs.just.isTplExists(tpl)) + { + tpl = 'items_page' + } + + $(holder).insertTpl(spajs.just.render(tpl, {item_id:data.reg[1], project_id:0, pmObj:thisObj})) }).fail(function() { $.notify("", "error"); @@ -335,7 +351,13 @@ pmItems.showNewItemPage = function(holder, menuInfo, data) { var def = new $.Deferred(); - var text = spajs.just.render(this.model.name+'_new_page', {parent_item:data.reg[2], parent_type:data.reg[1]}) + var tpl = this.model.name+'_new_page' + if(!spajs.just.isTplExists(tpl)) + { + tpl = 'items_new_page' + } + + var text = spajs.just.render(tpl, {parent_item:data.reg[2], parent_type:data.reg[1], pmObj:this}) console.log(text) $(holder).insertTpl(text) @@ -558,17 +580,29 @@ pmItems.loadItem = function(item_id) */ pmItems.deleteItem = function(item_id, force) { + var def = new $.Deferred(); if(!force && !confirm("Are you sure?")) { - return; + def.reject(); + return def.promise() } + var thisObj = this; - return $.when(this.deleteItemQuery(item_id)).done(function(data){ - //console.log("deleteItem", data); - spajs.open({ menuId:thisObj.model.name}) + $.when(this.deleteItemQuery(item_id)).done(function(data) + { + $.when(spajs.open({ menuId:thisObj.model.name})).done(function() + { + def.resolve() + }).fail(function(e){ + def.reject(); + polemarch.showErrors(e.responseJSON) + }) }).fail(function(e){ + def.reject(); polemarch.showErrors(e.responseJSON) - }).promise() + }) + + return def.promise() } pmItems.multiOperationsOnEachRow = function(elements, operation) @@ -765,3 +799,127 @@ pmItems.exportSelecedToFile = function(){ return this.exportToFile(item_ids) } + +/** + * Добавление сущности + * @return $.Deferred + */ +pmItems.addItem = function() +{ + var def = new $.Deferred(); + var data = {} + + for(var i in this.model.page_new.fileds) + { + for(var j in this.model.page_new.fileds[i]) + { + var val = this.model.page_new.fileds[i][j]; + + data[val.name] = val.filed.getValue(this, val) + if(val.validator !== undefined && !val.validator.apply(this, [data[val.name]])) + { + def.reject() + return def.promise(); + } + } + } + + if(this.model.page_new.onBeforeSave) + { + data = this.model.page_item.onBeforeSave.apply(this, [data]); + if(data === undefined) + { + def.reject() + return def.promise(); + } + } + + var thisObj = this; + spajs.ajax.Call({ + url: "/api/v1/"+this.model.name+"/", + type: "POST", + contentType:'application/json', + data: JSON.stringify(data), + success: function() + { + $.when(thisObj.model.page_new.onCreate.apply(thisObj, arguments)).always(function(){ + def.resolve() + }) + }, + error:function(e) + { + def.reject() + polemarch.showErrors(e.responseJSON) + } + }); + + return def.promise(); +} + +pmItems.updateItem = function(item_id) +{ + var def = new $.Deferred(); + var data = {} + + for(var i in this.model.page_item.fileds) + { + for(var j in this.model.page_item.fileds[i]) + { + var val = this.model.page_item.fileds[i][j]; + + data[val.name] = val.filed.getValue(this, val) + if(val.validator !== undefined && !val.validator.apply(this, [data[val.name]])) + { + def.reject() + return def.promise(); + } + } + } + + if(this.model.page_item.onBeforeSave) + { + data = this.model.page_item.onBeforeSave.apply(this, [data, item_id]); + if(data === undefined) + { + def.reject() + return def.promise(); + } + } + + var thisObj = this; + spajs.ajax.Call({ + url: "/api/v1/"+this.model.name+"/"+item_id+"/", + type: "PATCH", + contentType:'application/json', + data: JSON.stringify(data), + success: function(data) + { + thisObj.model.items[item_id] = data + $.when(thisObj.model.page_item.onUpdate.apply(thisObj, arguments)).always(function(){ + def.resolve() + }) + }, + error:function(e) + { + def.reject() + polemarch.showErrors(e.responseJSON) + } + }); + + return def.promise(); +} + + pmItems.getFiledByName = function(fileds, name) + { + for(var i in fileds) + { + for(var j in fileds[i]) + { + if(fileds[i][j].name == name) + { + return fileds[i][j] + } + } + } + debugger; + } \ No newline at end of file diff --git a/polemarch/static/js/pmModuleTemplates.js b/polemarch/static/js/pmModuleTemplates.js index 6d32b4af..1a136532 100644 --- a/polemarch/static/js/pmModuleTemplates.js +++ b/polemarch/static/js/pmModuleTemplates.js @@ -195,3 +195,19 @@ pmModuleTemplates.updateItem = function(item_id) } }); } + +tabSignal.connect("polemarch.start", function() +{ + spajs.addMenu({ + id:"Module-item", + urlregexp:[/^template\/Module\/([0-9]+)$/, /^templates\/Module\/([0-9]+)$/], + onOpen:function(holder, menuInfo, data){return pmModuleTemplates.showItem(holder, menuInfo, data);}, + }) + + spajs.addMenu({ + id:"module-new", + urlregexp:[/^template\/new-module$/], + onOpen:function(holder, menuInfo, data){return pmModuleTemplates.showNewItemPage(holder, menuInfo, data);} + }) + +}) \ No newline at end of file diff --git a/polemarch/static/js/pmPeriodicTasks.js b/polemarch/static/js/pmPeriodicTasks.js index 3212b2ae..0bf4a29d 100644 --- a/polemarch/static/js/pmPeriodicTasks.js +++ b/polemarch/static/js/pmPeriodicTasks.js @@ -104,8 +104,13 @@ pmPeriodicTasks.deleteItem = function(item_id, force) var project_id = pmPeriodicTasks.model.items[item_id].project; $.when(thisObj.deleteItemQuery(item_id)).done(function(data) { - def.resolve() - spajs.open({ menuId: "project/"+project_id+"/periodic-tasks"}) + $.when(spajs.open({ menuId: "project/"+project_id+"/periodic-tasks"})).done(function() + { + def.resolve() + }).fail(function(e){ + def.reject(); + polemarch.showErrors(e.responseJSON) + }) }).fail(function(e){ def.reject(); polemarch.showErrors(e.responseJSON) @@ -603,4 +608,33 @@ pmPeriodicTasks.updateItem = function(item_id) polemarch.showErrors(e.responseJSON) } }); -} \ No newline at end of file +} + +tabSignal.connect("polemarch.start", function() +{ + // tasks + spajs.addMenu({ + id:"PeriodicTasks", + urlregexp:[/^project\/([0-9]+)\/periodic-tasks$/, /^project\/([0-9]+)\/periodic-task$/, /^project\/([0-9]+)\/periodic-tasks\/page\/([0-9]+)$/], + onOpen:function(holder, menuInfo, data){return pmPeriodicTasks.showList(holder, menuInfo, data);} + }) + + spajs.addMenu({ + id:"PeriodicTasks-search", + urlregexp:[/^project\/([0-9]+)\/periodic-tasks\/search\/([A-z0-9 %\-.:,=]+)$/], + onOpen:function(holder, menuInfo, data){return pmPeriodicTasks.showSearchResults(holder, menuInfo, data);} + }) + + spajs.addMenu({ + id:"PeriodicTask", + urlregexp:[/^project\/([0-9]+)\/periodic-task\/([0-9]+)$/], + onOpen:function(holder, menuInfo, data){return pmPeriodicTasks.showItem(holder, menuInfo, data);} + }) + + spajs.addMenu({ + id:"newPeriodicTask", + urlregexp:[/^project\/([0-9]+)\/new-periodic-tasks$/], + onOpen:function(holder, menuInfo, data){return pmPeriodicTasks.showNewItemPage(holder, menuInfo, data);} + }) + +}) \ No newline at end of file diff --git a/polemarch/static/js/pmProjects.js b/polemarch/static/js/pmProjects.js index 0ac4cabd..4f18dc3e 100644 --- a/polemarch/static/js/pmProjects.js +++ b/polemarch/static/js/pmProjects.js @@ -40,6 +40,10 @@ pmProjects.openNewItemPage = function(holder, menuInfo, data) return def.promise(); } +/** + * Берёт данные со страницы "run playbook options" ( /?project/1/playbook/run ) для проекта и запускает выполнение Playbook + * @returns {$.Deferred} + */ pmProjects.executePlaybook = function(project_id) { var data_vars = jsonEditor.jsonEditorGetValues(); @@ -47,13 +51,17 @@ pmProjects.executePlaybook = function(project_id) return pmTasks.execute(project_id, $('#inventories-autocomplete').val(), $('#playbook-autocomplete').val(), data_vars); } +/** + * Строит страницу "run playbook options" ( /?project/1/playbook/run ) для проекта + * @returns {$.Deferred} + */ pmProjects.openRunPlaybookPage = function(holder, menuInfo, data) { var def = new $.Deferred(); var thisObj = this; var project_id = data.reg[1] $.when(pmTasks.searchItems(project_id, "project"), pmProjects.loadItem(project_id), pmInventories.loadAllItems()).done(function() - { + { $(holder).insertTpl(spajs.just.render(thisObj.model.name+'_run_playbook', {item_id:project_id, query:project_id})) $("#inventories-autocomplete").select2({ width: '100%' }); @@ -225,22 +233,7 @@ pmProjects.updateItem = function(item_id) /** * Показывает форму со списком всех групп. * @return $.Deferred - */ -pmProjects.showAddSubInventoriesForm = function(item_id, holder) -{ - return $.when(pmInventories.loadAllItems()).done(function(){ - $("#add_existing_item_to_project").remove() - $(".content").appendTpl(spajs.just.render('add_existing_inventories_to_project', {item_id:item_id})) - $("#polemarch-model-items-select").select2({ width: '100%' }); - }).fail(function(){ - - }).promise() -} - -/** - * Показывает форму со списком всех групп. - * @return $.Deferred - */ + * / pmProjects.showAddSubInventoriesForm = function(item_id, holder) { return $.when(pmInventories.loadAllItems()).done(function(){ @@ -250,12 +243,12 @@ pmProjects.showAddSubInventoriesForm = function(item_id, holder) }).fail(function(){ }).promise() -} +} // */ /** * Показывает форму со списком всех групп. * @return $.Deferred - */ + * / pmProjects.showAddSubGroupsForm = function(item_id, holder) { return $.when(pmGroups.loadAllItems()).done(function(){ @@ -265,12 +258,12 @@ pmProjects.showAddSubGroupsForm = function(item_id, holder) }).fail(function(){ }).promise() -} +} // */ /** * Показывает форму со списком всех хостов. * @return $.Deferred - */ + * / pmProjects.showAddSubHostsForm = function(item_id, holder) { return $.when(pmHosts.loadAllItems()).done(function(){ @@ -280,14 +273,14 @@ pmProjects.showAddSubHostsForm = function(item_id, holder) }).fail(function(){ }).promise() -} +} // */ /** * Проверяет принадлежит ли host_id к группе item_id * @param {Integer} item_id * @param {Integer} host_id * @returns {Boolean} - */ + * / pmProjects.hasHosts = function(item_id, host_id) { if(pmProjects.model.items[item_id]) @@ -301,14 +294,14 @@ pmProjects.hasHosts = function(item_id, host_id) } } return false; -} +} // */ /** * Проверяет принадлежит ли host_id к группе item_id * @param {Integer} item_id * @param {Integer} host_id * @returns {Boolean} - */ + * / pmProjects.hasGroups = function(item_id, group_id) { if(pmProjects.model.items[item_id]) @@ -322,14 +315,14 @@ pmProjects.hasGroups = function(item_id, group_id) } } return false; -} +} // */ /** * Проверяет принадлежит ли Inventory_id к группе item_id * @param {Integer} item_id * @param {Integer} inventory_id * @returns {Boolean} - */ + * / pmProjects.hasInventories = function(item_id, inventory_id) { if(pmProjects.model.items[item_id]) @@ -343,12 +336,12 @@ pmProjects.hasInventories = function(item_id, inventory_id) } } return false; -} +} // */ /** * @return $.Deferred - */ + * / pmProjects.setSubInventories = function(item_id, inventories_ids) { if(!inventories_ids) @@ -379,11 +372,11 @@ pmProjects.setSubInventories = function(item_id, inventories_ids) polemarch.showErrors(e.responseJSON) } }); -} +} // */ /** * @return $.Deferred - */ + * / pmProjects.setSubGroups = function(item_id, groups_ids) { if(!groups_ids) @@ -414,11 +407,11 @@ pmProjects.setSubGroups = function(item_id, groups_ids) polemarch.showErrors(e.responseJSON) } }); -} +} // */ /** * @return $.Deferred - */ + * / pmProjects.setSubHosts = function(item_id, hosts_ids) { if(!hosts_ids) @@ -448,11 +441,11 @@ pmProjects.setSubHosts = function(item_id, hosts_ids) polemarch.showErrors(e.responseJSON) } }); -} +} // */ /** * @return $.Deferred - */ + * / pmProjects.addSubInventories = function(item_id, inventories_ids) { if(!inventories_ids) @@ -493,11 +486,11 @@ pmProjects.addSubInventories = function(item_id, inventories_ids) } }); return def.promise(); -} +} // */ /** * @return $.Deferred - */ + * / pmProjects.addSubGroups = function(item_id, groups_ids) { if(!groups_ids) @@ -538,11 +531,11 @@ pmProjects.addSubGroups = function(item_id, groups_ids) } }); return def.promise(); -} +} // */ /** * @return $.Deferred - */ + * / pmProjects.addSubHosts = function(item_id, hosts_ids) { if(!hosts_ids) @@ -582,7 +575,7 @@ pmProjects.addSubHosts = function(item_id, hosts_ids) } }); return def.promise(); -} +} // */ /** * @return $.Deferred @@ -593,7 +586,7 @@ pmProjects.syncRepo = function(item_id) url: "/api/v1/projects/"+item_id+"/sync/", type: "POST", contentType:'application/json', - success: function(data) + success: function(data) { $.notify("Send sync query", "success"); }, @@ -614,7 +607,7 @@ pmProjects.supportedRepos = function() url: "/api/v1/projects/supported-repos/", type: "GET", contentType:'application/json', - success: function(data) + success: function(data) { pmProjects.model.supportedRepos = data; pmProjects.model.repository_type = data[0] @@ -629,4 +622,45 @@ pmProjects.supportedRepos = function() console.warn("project "+item_id+" sync error - " + JSON.stringify(e)); } }); -} \ No newline at end of file +} + +tabSignal.connect("polemarch.start", function() +{ + // projects + spajs.addMenu({ + id:"projects", + urlregexp:[/^projects$/, /^projects\/search\/?$/, /^project$/, /^projects\/page\/([0-9]+)$/], + onOpen:function(holder, menuInfo, data){return pmProjects.showUpdatedList(holder, menuInfo, data);}, + onClose:function(){return pmProjects.stopUpdates();}, + }) + + spajs.addMenu({ + id:"projects-search", + urlregexp:[/^projects\/search\/([A-z0-9 %\-.:,=]+)$/], + onOpen:function(holder, menuInfo, data){return pmProjects.showSearchResults(holder, menuInfo, data);} + }) + + spajs.addMenu({ + id:"project", + urlregexp:[/^project\/([0-9]+)$/, /^projects\/([0-9]+)$/], + onOpen:function(holder, menuInfo, data){return pmProjects.openItem(holder, menuInfo, data);} + }) + + spajs.addMenu({ + id:"newProject", + urlregexp:[/^new-project$/], + onOpen:function(holder, menuInfo, data){return pmProjects.openNewItemPage(holder, menuInfo, data);} + }) + + spajs.addMenu({ + id:"project-run-playbook", + urlregexp:[/^project\/([0-9]+)\/playbook\/run$/], + onOpen:function(holder, menuInfo, data){return pmProjects.openRunPlaybookPage(holder, menuInfo, data);} + }) + + spajs.addMenu({ + id:"project-ansible-module-run", + urlregexp:[/^project\/([0-9]+)\/ansible-module\/run$/], + onOpen:function(holder, menuInfo, data){return pmAnsibleModule.showInProject(holder, menuInfo, data);} + }) +}) \ No newline at end of file diff --git a/polemarch/static/js/pmTasksTemplates.js b/polemarch/static/js/pmTasksTemplates.js index 1d3ff744..5ee6d5e4 100644 --- a/polemarch/static/js/pmTasksTemplates.js +++ b/polemarch/static/js/pmTasksTemplates.js @@ -274,3 +274,32 @@ pmTasksTemplates.updateItem = function(item_id) } }); } + +tabSignal.connect("polemarch.start", function() +{ + // Tasks Templates + spajs.addMenu({ + id:"tasks", + urlregexp:[/^templates$/, /^templates\/page\/([0-9]+)$/], + onOpen:function(holder, menuInfo, data){return pmTasksTemplates.showList(holder, menuInfo, data);} + }) + + spajs.addMenu({ + id:"tasks-search", + urlregexp:[/^templates\/search\/([A-z0-9 %\-.:,=]+)$/], + onOpen:function(holder, menuInfo, data){return pmTasksTemplates.showSearchResults(holder, menuInfo, data);} + }) + + spajs.addMenu({ + id:"Task-item", + urlregexp:[/^template\/Task\/([0-9]+)$/, /^templates\/Task\/([0-9]+)$/], + onOpen:function(holder, menuInfo, data){return pmTasksTemplates.showItem(holder, menuInfo, data);}, + }) + + spajs.addMenu({ + id:"task-new", + urlregexp:[/^template\/new-task$/], + onOpen:function(holder, menuInfo, data){return pmTasksTemplates.showNewItemPage(holder, menuInfo, data);} + }) + +}) \ No newline at end of file diff --git a/polemarch/static/js/pmUsers.js b/polemarch/static/js/pmUsers.js index c83e1764..dc726706 100644 --- a/polemarch/static/js/pmUsers.js +++ b/polemarch/static/js/pmUsers.js @@ -1,10 +1,120 @@ - -var pmUsers = inheritance(pmItems) - + +var pmUsers = inheritance(pmItems) + pmUsers.model.name = "users" pmUsers.model.page_name = "user" pmUsers.model.className = "pmUsers" + +pmUsers.model.page_list = { + title: "Users", + short_title: "Users", + fileds:[ + { + title:'Name', + name:'username', + } + ], + actions:[ + { + class:'btn btn-danger', + function:function(item){ return 'spajs.showLoader('+this.model.className+'.deleteItem('+item.id+'));'}, + title:'Delete', + link:function(){ return '#'} + } + ] +} +pmUsers.fileds = [ + [ + { + filed: new filedsLib.filed.text(), + title:'User name', + name:'username', + placeholder:'Enter user name', + help:'', + validator:function(value){ return value != '' && value}, + fast_validator:function(value){ return value != '' && value} + }, + { + filed: new filedsLib.filed.password(), + title:'Password', + name:'password', + placeholder:'Enter user password', + help:'', + validator:function(value){ return value != '' && value}, + fast_validator:function(value){ return value != '' && value} + }, + ],[ + { + filed: new filedsLib.filed.text(), + title:'Email', + name:'email', + placeholder:'Enter user email', + help:'', + validator:function(value){ return value != '' && value}, + fast_validator:function(value){ return value != '' && value} + }, + { + filed: new filedsLib.filed.text(), + title:'First name', + name:'first_name', + placeholder:'Enter user first name', + help:'', + validator:function(value){ return value != '' && value}, + fast_validator:function(value){ return value != '' && value} + }, + ],[ + { + filed: new filedsLib.filed.text(), + title:'Last name', + name:'last_name', + placeholder:'Enter user last name', + help:'', + validator:function(value){ return value != '' && value}, + fast_validator:function(value){ return value != '' && value} + }, + { + filed: new filedsLib.filed.boolean(), + title:'Is active', + name:'is_active', + help:'', + validator:function(value){ return value != '' && value}, + fast_validator:function(value){ return value != '' && value} + } + ] + ] + +pmUsers.model.page_new = { + title: "New user", + short_title: "New user", + fileds:pmUsers.fileds, + onCreate:function(result) + { + var def = new $.Deferred(); + $.notify("User created", "success"); + $.when(spajs.open({ menuId:pmUsers.model.page_name+"/"+result.id})).always(function(){ + def.resolve() + }) + + return def.promise(); + } +} + +pmUsers.model.page_item = { + title: function(item_id){ + return "User "+pmUsers.model.items[item_id].justText('username') + }, + short_title: function(item_id){ + return "User "+pmUsers.model.items[item_id].justText('username', function(v){return v.slice(0, 20)}) + }, + fileds:pmUsers.fileds, + onUpdate:function(result) + { + return true; + } +} + + pmUsers.copyItem = function(item_id) { var def = new $.Deferred(); @@ -36,103 +146,34 @@ pmUsers.copyItem = function(item_id) }) - return def.promise(); -} - -/** - * @return $.Deferred - */ -pmUsers.addItem = function() -{ - var def = new $.Deferred(); - var data = {} - - data.email = $("#new_user_email").val() - data.first_name = $("#new_user_first_name").val() - data.last_name = $("#new_user_last_name").val() - data.username = $("#new_user_username").val() - data.is_active = $("#new_user_is_active").hasClass('selected') - data.is_staff = true // $("#new_user_is_staff").val() - data.password = $("#new_user_password").val() - - if(!data.username) - { - $.notify("Invalid value in field name", "error"); - def.reject() - return def.promise(); - } - - if(!data.password) - { - $.notify("Invalid value in field password", "error"); - def.reject() - return def.promise(); - } - - spajs.ajax.Call({ - url: "/api/v1/users/", - type: "POST", - contentType:'application/json', - data: JSON.stringify(data), - success: function(data) - { - $.notify("User created", "success"); - $.when(spajs.open({ menuId:"user/"+data.id})).always(function(){ - def.resolve() - }) - }, - error:function(e) - { - def.reject() - polemarch.showErrors(e.responseJSON) - } - }); - return def.promise(); } + + tabSignal.connect("polemarch.start", function() + { + // users + spajs.addMenu({ + id:"users", + urlregexp:[/^users$/, /^user$/, /^users\/search\/?$/, /^users\/page\/([0-9]+)$/], + onOpen:function(holder, menuInfo, data){return pmUsers.showList(holder, menuInfo, data);} + }) -/** - * @return $.Deferred - */ -pmUsers.updateItem = function(item_id) -{ - var data = {} - - data.email = $("#user_"+item_id+"_email").val() - data.first_name = $("#user_"+item_id+"_first_name").val() - data.last_name = $("#user_"+item_id+"_last_name").val() - data.username = $("#user_"+item_id+"_username").val() - data.is_active = $("#user_"+item_id+"_is_active").hasClass('selected') - data.is_staff = true // $("#user_"+item_id+"_is_staff").val() + spajs.addMenu({ + id:"users-search", + urlregexp:[/^users\/search\/([A-z0-9 %\-.:,=]+)$/], + onOpen:function(holder, menuInfo, data){return pmUsers.showSearchResults(holder, menuInfo, data);} + }) - if(!data.username) - { - console.warn("Invalid value in field name") - $.notify("Invalid value in field name", "error"); - return; - } + spajs.addMenu({ + id:"user", + urlregexp:[/^user\/([0-9]+)$/, /^users\/([0-9]+)$/], + onOpen:function(holder, menuInfo, data){return pmUsers.showItem(holder, menuInfo, data);} + }) - if($("#user_"+item_id+"_password").val()) - { - data.password = $("#user_"+item_id+"_password").val() - } + spajs.addMenu({ + id:"newuser", + urlregexp:[/^new-user$/], + onOpen:function(holder, menuInfo, data){return pmUsers.showNewItemPage(holder, menuInfo, data);} + }) - var thisObj = this; - return spajs.ajax.Call({ - url: "/api/v1/users/"+item_id+"/", - type: "PATCH", - contentType:'application/json', - data:JSON.stringify(data), - success: function(data) - { - thisObj.model.items[item_id] = data - $.notify("Save", "success"); - }, - error:function(e) - { - console.warn("user "+item_id+" update error - " + JSON.stringify(e)); - polemarch.showErrors(e.responseJSON) - } - }); -} - \ No newline at end of file + }) \ No newline at end of file diff --git a/polemarch/static/js/polemarch.js b/polemarch/static/js/polemarch.js index 890f4c0f..f9cff0b0 100644 --- a/polemarch/static/js/polemarch.js +++ b/polemarch/static/js/polemarch.js @@ -112,284 +112,8 @@ polemarch.start = function(options) preventDefaultEvents: false }); + tabSignal.emit("polemarch.start") - spajs.addMenu({ - id:"home", - urlregexp:[/^(home|)$/], - onOpen:function(holder, menuInfo, data){return pmDashboard.open(holder, menuInfo, data);}, - onClose:function(){return pmDashboard.stopUpdates();}, - }) - - // users - spajs.addMenu({ - id:"users", - urlregexp:[/^users$/, /^user$/, /^users\/search\/?$/, /^users\/page\/([0-9]+)$/], - onOpen:function(holder, menuInfo, data){return pmUsers.showList(holder, menuInfo, data);} - }) - - spajs.addMenu({ - id:"users-search", - urlregexp:[/^users\/search\/([A-z0-9 %\-.:,=]+)$/], - onOpen:function(holder, menuInfo, data){return pmUsers.showSearchResults(holder, menuInfo, data);} - }) - - spajs.addMenu({ - id:"user", - urlregexp:[/^user\/([0-9]+)$/, /^users\/([0-9]+)$/], - onOpen:function(holder, menuInfo, data){return pmUsers.showItem(holder, menuInfo, data);} - }) - - spajs.addMenu({ - id:"newuser", - urlregexp:[/^new-user$/], - onOpen:function(holder, menuInfo, data){return pmUsers.showNewItemPage(holder, menuInfo, data);} - }) - - - // hosts - spajs.addMenu({ - id:"hosts", - urlregexp:[/^hosts$/, /^host$/, /^hosts\/search\/?$/, /^hosts\/page\/([0-9]+)$/], - onOpen:function(holder, menuInfo, data){return pmHosts.showList(holder, menuInfo, data);} - }) - - spajs.addMenu({ - id:"hosts-search", - urlregexp:[/^hosts\/search\/([A-z0-9 %\-.:,=]+)$/], - onOpen:function(holder, menuInfo, data){return pmHosts.showSearchResults(holder, menuInfo, data);} - }) - - spajs.addMenu({ - id:"host", - urlregexp:[/^host\/([0-9]+)$/, /^hosts\/([0-9]+)$/], - onOpen:function(holder, menuInfo, data){return pmHosts.showItem(holder, menuInfo, data);} - }) - - spajs.addMenu({ - id:"newHost", - urlregexp:[/^new-host$/, /^([A-z0-9_]+)\/([0-9]+)\/new-host$/], - onOpen:function(holder, menuInfo, data){return pmHosts.showNewItemPage(holder, menuInfo, data);} - }) - - - // groups - spajs.addMenu({ - id:"groups", - urlregexp:[/^groups$/, /^group$/, /^groups\/search\/?$/, /^groups\/page\/([0-9]+)$/], - onOpen:function(holder, menuInfo, data){return pmGroups.showList(holder, menuInfo, data);} - }) - - spajs.addMenu({ - id:"groups-search", - urlregexp:[/^groups\/search\/([A-z0-9 %\-.:,=]+)$/], - onOpen:function(holder, menuInfo, data){return pmGroups.showSearchResults(holder, menuInfo, data);} - }) - - spajs.addMenu({ - id:"group", - urlregexp:[/^group\/([0-9]+)$/, /^groups\/([0-9]+)$/], - onOpen:function(holder, menuInfo, data){return pmGroups.showItem(holder, menuInfo, data);} - }) - - spajs.addMenu({ - id:"newGroup", - urlregexp:[/^new-group$/, /^([A-z0-9_]+)\/([0-9]+)\/new-group$/], - onOpen:function(holder, menuInfo, data){return pmGroups.showNewItemPage(holder, menuInfo, data);} - }) - - // inventories - spajs.addMenu({ - id:"inventories", - urlregexp:[/^inventories$/, /^inventory$/, /^inventories\/search\/?$/, /^inventories\/page\/([0-9]+)$/], - onOpen:function(holder, menuInfo, data){return pmInventories.showList(holder, menuInfo, data);} - }) - - spajs.addMenu({ - id:"inventories-import", - urlregexp:[/^inventories\/import$/], - onOpen:function(holder, menuInfo, data){return pmInventories.showImportPage(holder, menuInfo, data);} - }) - - - spajs.addMenu({ - id:"inventories-search", - urlregexp:[/^inventories\/search\/([A-z0-9 %\-.:,=]+)$/], - onOpen:function(holder, menuInfo, data){return pmInventories.showSearchResults(holder, menuInfo, data);} - }) - - spajs.addMenu({ - id:"inventory", - urlregexp:[/^inventory\/([0-9]+)$/, /^inventories\/([0-9]+)$/], - onOpen:function(holder, menuInfo, data){return pmInventories.showItem(holder, menuInfo, data);} - }) - - spajs.addMenu({ - id:"inventory-history", - urlregexp:[/^inventory\/([0-9]+)\/history$/, /^inventory\/([0-9]+)\/history\/page\/([0-9]+)$/], - onOpen:function(holder, menuInfo, data){return pmHistory.showListInInventory(holder, menuInfo, data);} - }) - - spajs.addMenu({ - id:"newInventory", - urlregexp:[/^new-inventory$/, /^([A-z0-9_]+)\/([0-9]+)\/new-inventory$/], - onOpen:function(holder, menuInfo, data){return pmInventories.showNewItemPage(holder, menuInfo, data);} - }) - - // projects - spajs.addMenu({ - id:"projects", - urlregexp:[/^projects$/, /^projects\/search\/?$/, /^project$/, /^projects\/page\/([0-9]+)$/], - onOpen:function(holder, menuInfo, data){return pmProjects.showUpdatedList(holder, menuInfo, data);}, - onClose:function(){return pmProjects.stopUpdates();}, - }) - - spajs.addMenu({ - id:"projects-search", - urlregexp:[/^projects\/search\/([A-z0-9 %\-.:,=]+)$/], - onOpen:function(holder, menuInfo, data){return pmProjects.showSearchResults(holder, menuInfo, data);} - }) - - spajs.addMenu({ - id:"project", - urlregexp:[/^project\/([0-9]+)$/, /^projects\/([0-9]+)$/], - onOpen:function(holder, menuInfo, data){return pmProjects.openItem(holder, menuInfo, data);} - }) - - spajs.addMenu({ - id:"newProject", - urlregexp:[/^new-project$/], - onOpen:function(holder, menuInfo, data){return pmProjects.openNewItemPage(holder, menuInfo, data);} - }) - - spajs.addMenu({ - id:"project-run-playbook", - urlregexp:[/^project\/([0-9]+)\/playbook\/run$/], - onOpen:function(holder, menuInfo, data){return pmProjects.openRunPlaybookPage(holder, menuInfo, data);} - }) - - spajs.addMenu({ - id:"project-ansible-module-run", - urlregexp:[/^project\/([0-9]+)\/ansible-module\/run$/], - onOpen:function(holder, menuInfo, data){return pmAnsibleModule.showInProject(holder, menuInfo, data);} - }) - - // tasks - spajs.addMenu({ - id:"PeriodicTasks", - urlregexp:[/^project\/([0-9]+)\/periodic-tasks$/, /^project\/([0-9]+)\/periodic-task$/, /^project\/([0-9]+)\/periodic-tasks\/page\/([0-9]+)$/], - onOpen:function(holder, menuInfo, data){return pmPeriodicTasks.showList(holder, menuInfo, data);} - }) - - spajs.addMenu({ - id:"PeriodicTasks-search", - urlregexp:[/^project\/([0-9]+)\/periodic-tasks\/search\/([A-z0-9 %\-.:,=]+)$/], - onOpen:function(holder, menuInfo, data){return pmPeriodicTasks.showSearchResults(holder, menuInfo, data);} - }) - - spajs.addMenu({ - id:"PeriodicTask", - urlregexp:[/^project\/([0-9]+)\/periodic-task\/([0-9]+)$/], - onOpen:function(holder, menuInfo, data){return pmPeriodicTasks.showItem(holder, menuInfo, data);} - }) - - spajs.addMenu({ - id:"newPeriodicTask", - urlregexp:[/^project\/([0-9]+)\/new-periodic-tasks$/], - onOpen:function(holder, menuInfo, data){return pmPeriodicTasks.showNewItemPage(holder, menuInfo, data);} - }) - - // history - spajs.addMenu({ - id:"history", - urlregexp:[/^history$/, /^history\/search\/?$/, /^history\/page\/([0-9]+)$/], - onOpen:function(holder, menuInfo, data){return pmHistory.showUpdatedList(holder, menuInfo, data);}, - onClose:function(){return pmHistory.stopUpdates();}, - }) - - spajs.addMenu({ - id:"history-search", - urlregexp:[/^history\/search\/([A-z0-9 %\-.:,=]+)$/], - onOpen:function(holder, menuInfo, data){return pmHistory.showSearchResults(holder, menuInfo, data);} - }) - - spajs.addMenu({ - id:"history-item", - urlregexp:[/^history\/([0-9]+)$/], - onOpen:function(holder, menuInfo, data){return pmHistory.showItem(holder, menuInfo, data);}, - onClose:function(){return pmHistory.stopUpdates();} - }) - - spajs.addMenu({ - id:"history-item-in-project", - urlregexp:[/^project\/([0-9]+)\/history\/([0-9]+)$/], - onOpen:function(holder, menuInfo, data){return pmHistory.showItemInProjects(holder, menuInfo, data);}, - onClose:function(){return pmHistory.stopUpdates();} - }) - - spajs.addMenu({ - id:"project-history", - urlregexp:[/^project\/([0-9]+)\/history$/, /^project\/([0-9]+)\/history\/page\/([0-9]+)$/], - onOpen:function(holder, menuInfo, data){ - return pmHistory.showUpdatedList(holder, menuInfo, data, "showListInProjects", function(menuInfo, data) - { - var offset = 0 - var limit = pmHistory.pageSize; - if(data.reg && data.reg[2] > 0) - { - offset = pmHistory.pageSize*(data.reg[2] - 1); - } - var project_id = data.reg[1]; - - return pmHistory.sendSearchQuery({project:project_id}, limit, offset) - }); - }, - onClose:function(){return pmHistory.stopUpdates();}, - }) - - spajs.addMenu({ - id:"project-history-search", - urlregexp:[/^project\/([0-9]+)\/history\/search\/([A-z0-9 %\-.:,=]+)$/], - onOpen:function(holder, menuInfo, data){return pmHistory.showSearchResultsInProjects(holder, menuInfo, data);} - }) - - - // Tasks Templates - spajs.addMenu({ - id:"tasks", - urlregexp:[/^templates$/, /^templates\/page\/([0-9]+)$/], - onOpen:function(holder, menuInfo, data){return pmTasksTemplates.showList(holder, menuInfo, data);} - }) - - spajs.addMenu({ - id:"tasks-search", - urlregexp:[/^templates\/search\/([A-z0-9 %\-.:,=]+)$/], - onOpen:function(holder, menuInfo, data){return pmTasksTemplates.showSearchResults(holder, menuInfo, data);} - }) - - spajs.addMenu({ - id:"Task-item", - urlregexp:[/^template\/Task\/([0-9]+)$/, /^templates\/Task\/([0-9]+)$/], - onOpen:function(holder, menuInfo, data){return pmTasksTemplates.showItem(holder, menuInfo, data);}, - }) - - spajs.addMenu({ - id:"task-new", - urlregexp:[/^template\/new-task$/], - onOpen:function(holder, menuInfo, data){return pmTasksTemplates.showNewItemPage(holder, menuInfo, data);} - }) - - spajs.addMenu({ - id:"Module-item", - urlregexp:[/^template\/Module\/([0-9]+)$/, /^templates\/Module\/([0-9]+)$/], - onOpen:function(holder, menuInfo, data){return pmModuleTemplates.showItem(holder, menuInfo, data);}, - }) - - spajs.addMenu({ - id:"module-new", - urlregexp:[/^template\/new-module$/], - onOpen:function(holder, menuInfo, data){return pmModuleTemplates.showNewItemPage(holder, menuInfo, data);} - }) - spajs.openMenuFromUrl() } diff --git a/polemarch/static/js/tests/qUnitTest.js b/polemarch/static/js/tests/qUnitTest.js index 11077543..f44b6b5a 100644 --- a/polemarch/static/js/tests/qUnitTest.js +++ b/polemarch/static/js/tests/qUnitTest.js @@ -412,11 +412,11 @@ window.qunitTestsArray.push(function() var done = assert.async(); // Заполнение формы с данными пользователя - $("#new_user_username").val("admin"); - $("#new_user_password").val("admin"); - $("#new_user_email").val("admin"); - $("#new_user_first_name").val("admin"); - $("#new_user_last_name").val("admin"); + $("#filed_username").val("admin"); + $("#filed_password").val("admin"); + $("#filed_email").val("admin"); + $("#filed_first_name").val("admin"); + $("#filed_last_name").val("admin"); // Отправка формы с данными пользователя $.when(pmUsers.addItem()).done(function() @@ -436,11 +436,11 @@ window.qunitTestsArray.push(function() var done = assert.async(); // Заполнение формы с данными пользователя - $("#new_user_username").val("admin"+t); - $("#new_user_password").val("admin"); - $("#new_user_email").val("admin"); - $("#new_user_first_name").val("admin"); - $("#new_user_last_name").val("admin"); + $("#filed_username").val("admin"+t); + $("#filed_password").val("admin"); + $("#filed_email").val("admin"); + $("#filed_first_name").val("admin"); + $("#filed_last_name").val("admin"); // Отправка формы с данными пользователя $.when(pmUsers.addItem()).done(function() @@ -460,11 +460,11 @@ window.qunitTestsArray.push(function() var done = assert.async(); // Заполнение формы с данными пользователя - $("#new_user_username").val("test-user-"+t); - $("#new_user_password").val("test-user-"+t); - $("#new_user_email").val("test2@user.ru"); - $("#new_user_first_name").val("test"); - $("#new_user_last_name").val("user"); + $("#filed_username").val("test-user-"+t); + $("#filed_password").val("test-user-"+t); + $("#filed_email").val("test2@user.ru"); + $("#filed_first_name").val("test"); + $("#filed_last_name").val("user"); // Отправка формы с данными пользователя $.when(pmUsers.addItem()).done(function() @@ -487,11 +487,11 @@ window.qunitTestsArray.push(function() // с адресом http://192.168.0.12:8080/?user-5 userId = /user\/([0-9]+)/.exec(window.location.href)[1] - $("#user_"+userId+"_username").val("admin"); - $("#user_"+userId+"_password").val("test2-user-"+t); - $("#user_"+userId+"_email").val("test2@user.ru"); - $("#user_"+userId+"_first_name").val("test2-"+t); - $("#user_"+userId+"_last_name").val("user2-"+t); + $("#filed_username").val("admin"); + $("#filed_password").val("test2-user-"+t); + $("#filed_email").val("test2@user.ru"); + $("#filed_first_name").val("test2-"+t); + $("#filed_last_name").val("user2-"+t); $.when(pmUsers.updateItem(userId)).done(function() { @@ -511,11 +511,11 @@ window.qunitTestsArray.push(function() // с адресом http://192.168.0.12:8080/?user-5 userId = /user\/([0-9]+)/.exec(window.location.href)[1] - $("#user_"+userId+"_username").val("test2-user-"+t); - $("#user_"+userId+"_password").val("test2-user-"+t); - $("#user_"+userId+"_email").val("test2@user.ru"); - $("#user_"+userId+"_first_name").val("test2-"+t); - $("#user_"+userId+"_last_name").val("user2-"+t); + $("#filed_username").val("test2-user-"+t); + $("#filed_password").val("test2-user-"+t); + $("#filed_email").val("test2@user.ru"); + $("#filed_first_name").val("test2-"+t); + $("#filed_last_name").val("user2-"+t); $.when(pmUsers.updateItem(userId)).done(function() { @@ -665,8 +665,7 @@ window.qunitTestsArray.push(function() var done = assert.async(); // Заполнение формы с данными хоста - $("#new_host_name").val("test-host-"+t); - $("#new_host_type").val("HOST"); + $("#filed_name").val("test-host-"+t); $("#new_json_nameprefix").val("test1"); $("#new_json_valueprefix").val("val1"); @@ -698,7 +697,7 @@ window.qunitTestsArray.push(function() // с адресом http://192.168.0.12:8080/?host-5 itemId = /host\/([0-9]+)/.exec(window.location.href)[1] - $("#host_"+itemId+"_name").val("test2-hosts-"+t); + $("#filed_name").val("test2-hosts-"+t); $("#new_json_nameprefix").val("test3"); $("#new_json_valueprefix").val("val3"); @@ -880,6 +879,84 @@ window.qunitTestsArray.push(function() }) }); + syncQUnit.addTest('Обновление группы setSubGroups', function ( assert ) + { + var done = assert.async(); + + // Предполагается что мы от прошлого теста попали на страницу редактирования группы + // с адресом http://192.168.0.12:8080/?group-5 + var itemId = /group\/([0-9]+)/.exec(window.location.href)[1] + + + assert.ok(!pmGroups.hasGroups(itemId, 99999999999), 'pmGroups.hasGroups() вернула не тот результат'); + + $.when(pmGroups.setSubGroups(itemId, [99999999999])).done(function() + { + assert.ok(true, 'Успешно setSubGroups'); + render(done) + }).fail(function(){ + assert.ok(false, 'Ошибка при setSubGroups'); // На сервере такой группы наверное нет + render(done) + }) + }); + + syncQUnit.addTest('Обновление группы setSubHosts', function ( assert ) + { + var done = assert.async(); + + // Предполагается что мы от прошлого теста попали на страницу редактирования группы + // с адресом http://192.168.0.12:8080/?group-5 + var itemId = /group\/([0-9]+)/.exec(window.location.href)[1] + + + assert.ok(!pmGroups.hasHosts(itemId, 99999999999), 'pmGroups.hasHosts() вернула не тот результат'); + + $.when(pmGroups.setSubHosts(itemId, [99999999999])).done(function() + { + assert.ok(false, 'Ошибка при setSubHosts'); + render(done) + }).fail(function(){ + assert.ok(true, 'Успешно setSubHosts'); // Group is children. + render(done) + }) + }); + + syncQUnit.addTest('pmGroups.showAddSubGroupsForm', function ( assert ) + { + var done = assert.async(); + + // Предполагается что мы от прошлого теста попали на страницу редактирования группы + // с адресом http://192.168.0.12:8080/?group-5 + var itemId = /group\/([0-9]+)/.exec(window.location.href)[1] + + $.when(pmGroups.showAddSubGroupsForm(itemId)).done(function() + { + assert.ok(true, 'Успешно showAddSubGroupsForm'); + render(done) + }).fail(function(){ + assert.ok(false, 'Ошибка при showAddSubGroupsForm'); + render(done) + }) + }); + + syncQUnit.addTest('pmGroups.showAddSubHostsForm', function ( assert ) + { + var done = assert.async(); + + // Предполагается что мы от прошлого теста попали на страницу редактирования группы + // с адресом http://192.168.0.12:8080/?group-5 + var itemId = /group\/([0-9]+)/.exec(window.location.href)[1] + + $.when(pmGroups.showAddSubHostsForm(itemId)).done(function() + { + assert.ok(true, 'Успешно showAddSubHostsForm'); + render(done) + }).fail(function(){ + assert.ok(false, 'Ошибка при showAddSubHostsForm'); + render(done) + }) + }); + syncQUnit.addTest('Открытие страницы создания подгруппы', function ( assert ) { var done = assert.async(); @@ -900,7 +977,7 @@ window.qunitTestsArray.push(function() }) }); - var itemId = undefined + var itemId = undefined syncQUnit.addTest('Сохранение подгруппы', function ( assert ) { // Предполагается что мы от прошлого теста попали на страницу создания группы @@ -916,10 +993,10 @@ window.qunitTestsArray.push(function() $("#new_json_nameprefix").val("test2"); $("#new_json_valueprefix").val("val2"); jsonEditor.jsonEditorAddVar(); - + var master_group_itemId = /group\/([0-9]+)/.exec(window.location.href)[1] itemId = master_group_itemId - + // Отправка формы с данными группы $.when(pmGroups.addItem('group', master_group_itemId)).done(function() { @@ -1022,6 +1099,115 @@ window.qunitTestsArray.push(function() render(done) }) }); + + + + + syncQUnit.addTest('Страница создания группы не children', function ( assert ) + { + var done = assert.async(); + + // Открытие пункта меню new-host + $.when(spajs.open({ menuId:"new-group"})).done(function() + { + assert.ok(true, 'Успешно открыто меню new-group'); + render(done) + }).fail(function() + { + assert.ok(false, 'Ошибка при открытиии меню new-group'); + render(done) + }) + }); + + var t = new Date(); + t = t.getTime() + + syncQUnit.addTest('Сохранение группы не children', function ( assert ) + { + // Предполагается что мы от прошлого теста попали на страницу создания группы + var done = assert.async(); + + // Заполнение формы с данными группы + $("#new_group_name").val("test-group-"+t); + + $("#new_json_nameprefix").val("test3"); + $("#new_json_valueprefix").val("val3"); + jsonEditor.jsonEditorAddVar(); + + $("#new_json_nameprefix").val("test4"); + $("#new_json_valueprefix").val("val4"); + jsonEditor.jsonEditorAddVar(); + + // Отправка формы с данными группы + $.when(pmGroups.addItem()).done(function() + { + assert.ok(true, 'Успешно group add Item'); + render(done) + }).fail(function() + { + debugger; + assert.ok(false, 'Ошибка при group add Item'); + render(done) + }) + }); + + syncQUnit.addTest('Обновление группы не children', function ( assert ) + { + var done = assert.async(); + + // Предполагается что мы от прошлого теста попали на страницу редактирования группы + // с адресом http://192.168.0.12:8080/?group-5 + itemId = /group\/([0-9]+)/.exec(window.location.href)[1] + + + assert.ok(!pmGroups.hasGroups(itemId, 99999999999), 'pmGroups.hasGroups() вернула не тот результат'); + + $.when(pmGroups.setSubGroups(itemId, [99999999999])).done(function() + { + debugger; + assert.ok(false, 'Ошибка при setSubGroups'); // На сервере такой группы наверное нет + render(done) + }).fail(function(){ + assert.ok(true, 'Успешно setSubGroups'); // Group is children. + render(done) + }) + }); + + syncQUnit.addTest('Обновление группы не children', function ( assert ) + { + var done = assert.async(); + assert.ok(!pmGroups.hasHosts(itemId, 99999999999), 'pmGroups.hasHosts() вернула не тот результат'); + + $.when(pmGroups.setSubHosts(itemId, [99999999999])).done(function() + { + assert.ok(true, 'Успешно setSubHosts'); // Group is children. + render(done) + }).fail(function(){ + debugger; + assert.ok(false, 'Ошибка при setSubHosts'); + render(done) + }) + }); + + syncQUnit.addTest('Удаление группы не children', function ( assert ) + { + var done = assert.async(); + + // Удаление группы. + $.when(pmGroups.deleteItem(itemId, true)).done(function() + { + assert.ok(true, 'Успешно delete add Item'); + render(done) + }).fail(function(){ + debugger; + assert.ok(false, 'Ошибка при delete add Item'); + render(done) + }) + }); + + + + }) @@ -1061,6 +1247,7 @@ window.qunitTestsArray.push(function() }) }); + var t = new Date(); t = t.getTime() @@ -1148,7 +1335,7 @@ window.qunitTestsArray.push(function() }) var itemId = undefined - syncQUnit.addTest('Копирование группы', function ( assert ) + syncQUnit.addTest('Копирование Inventory', function ( assert ) { // Предполагается что мы от прошлого теста попали на страницу редактирования группы // с адресом http://192.168.0.12:8080/?group-5 @@ -1165,7 +1352,18 @@ window.qunitTestsArray.push(function() }) }); - syncQUnit.addTest('Удаление копии группы', function ( assert ) + syncQUnit.addTest('Проверка функции автокомплита для групп', function ( assert ) + { + // Предполагается что мы от прошлого теста попали на страницу редактирования группы + // с адресом http://192.168.0.12:8080/?group-5 + var itemId = /inventory\/([0-9]+)/.exec(window.location.href)[1] + + pmGroups.groupsAutocompleteMatcher("A", function(res){ + assert.ok(true, 'Успешно'); + }, itemId) + }); + + syncQUnit.addTest('Удаление копии Inventory', function ( assert ) { var done = assert.async(); @@ -1173,7 +1371,6 @@ window.qunitTestsArray.push(function() // с адресом http://192.168.0.12:8080/?user-5 var itemId = /inventory\/([0-9]+)/.exec(window.location.href)[1] - // Удаление пользователя. $.when(pmInventories.deleteItem(itemId, true)).done(function() { assert.ok(true, 'Успешно delete add Item'); @@ -1184,6 +1381,21 @@ window.qunitTestsArray.push(function() }) }); + syncQUnit.addTest('Страница списка inventory History', function ( assert ) + { + var done = assert.async(); + $.when(spajs.open({ menuId:'inventory/'+itemId+'/history'})).done(function() + { + assert.ok(true, 'Страница открылась'); + render(done) + }).fail(function() + { + assert.ok(false, 'Страница не открылась'); + render(done) + }) + }) + + syncQUnit.addTest('Удаление inventory', function ( assert ) { var done = assert.async(); @@ -1536,7 +1748,42 @@ window.qunitTestsArray.push(function() render(done) }) }); + + syncQUnit.addTest('pmProjects.syncRepo', function ( assert ) + { + var done = assert.async(); + // Предполагается что мы от прошлого теста попали на страницу редактирования project + // с адресом http://192.168.0.12:8080/?group-5 + var itemId = /project\/([0-9]+)/.exec(window.location.href)[1] + $.when(pmProjects.syncRepo(itemId)).done(function() + { + assert.ok(true, 'Успешно syncRepo'); + render(done) + }).fail(function(){ + assert.ok(false, 'Ошибка при syncRepo'); + render(done) + }) + }); + + syncQUnit.addTest('pmProjects.executePlaybook', function ( assert ) + { + var done = assert.async(); + $('#inventories-autocomplete').val('') + $('#playbook-autocomplete').val('') + + // Предполагается что мы от прошлого теста попали на страницу редактирования project + // с адресом http://192.168.0.12:8080/?group-5 + var itemId = /project\/([0-9]+)/.exec(window.location.href)[1] + $.when(pmProjects.executePlaybook(itemId)).done(function() + { + assert.ok(false, 'Успешно executePlaybook'); + render(done) + }).fail(function(){ + assert.ok(true, 'Ошибка при executePlaybook'); + render(done) + }) + }); /* syncQUnit.addTest('Проверка добавления невалидных подгрупп к project', function ( assert ) { @@ -1695,7 +1942,7 @@ window.qunitTestsArray.push(function() $.when(pmModuleTemplates.selectInventory(inventoryId)).done(function() { - $('#inventories-autocomplete').val(inventoryId) + pmAnsibleModule.selectInventory(inventoryId) // Отправка формы с данными project $.when(pmAnsibleModule.execute(itemId, 99999, "All", $('#module-autocomplete').val())).done(function() { @@ -2097,6 +2344,21 @@ window.qunitTestsArray.push(function() }) }) + syncQUnit.addTest('Страница списка History', function ( assert ) + { + var done = assert.async(); + var itemId = /project\/([0-9]+)/.exec(window.location.href)[1] + $.when(spajs.open({ menuId:'project/'+itemId+'/history'})).done(function() + { + assert.ok(true, 'Страница открылась'); + render(done) + }).fail(function() + { + assert.ok(false, 'Страница не открылась'); + render(done) + }) + }) + syncQUnit.addTest('Удаление проекта', function ( assert ) { var done = assert.async(); @@ -2412,9 +2674,7 @@ window.qunitTestsArray.push(function() syncQUnit.addTest('Изменение шаблона модуля', function ( assert ) { var done = assert.async(); - - // Предполагается что мы от прошлого теста попали на страницу редактирования project - // с адресом http://192.168.0.12:8080/?group-5 + var itemId = /template\/Module\/([0-9]+)/.exec(window.location.href)[1] jsonEditor.jsonEditorRmVar("new-vault-password-file2") @@ -2437,9 +2697,7 @@ window.qunitTestsArray.push(function() var itemId = undefined syncQUnit.addTest('Копирование template Module', function ( assert ) - { - // Предполагается что мы от прошлого теста попали на страницу редактирования группы - // с адресом http://192.168.0.12:8080/?group-5 + { itemId = /template\/Module\/([0-9]+)/.exec(window.location.href)[1] var done = assert.async(); @@ -2452,7 +2710,22 @@ window.qunitTestsArray.push(function() render(done) }) }); - +/* + syncQUnit.addTest('Выполнение template Module', function ( assert ) + { + var itemId = /template\/Module\/([0-9]+)/.exec(window.location.href)[1] + debugger; + var done = assert.async(); + $.when(pmModuleTemplates.execute(itemId)).done(function() + { + assert.ok(true, 'Успешно pmModuleTemplates.execute'); + render(done) + }).fail(function(){ + assert.ok(false, 'Ошибка при pmModuleTemplates.execute'); + render(done) + }) + });*/ + syncQUnit.addTest('Удаление копии template Module', function ( assert ) { var done = assert.async(); @@ -2488,6 +2761,144 @@ window.qunitTestsArray.push(function() }); }) +/** + * Тестирование pmDashboard + */ +window.qunitTestsArray.push(function() +{ + + syncQUnit.addTest('Страница dashboard', function ( assert ) + { + var done = assert.async(); + + $.when(spajs.open({ menuId:"home"})).done(function() + { + assert.ok(true, 'Успешно открыто меню pmDashboard'); + setTimeout(function(){// Ждём завершения всех асинхронных запросов на странице + render(done) + }, 5000) + }).fail(function() + { + assert.ok(false, 'Ошибка при открытиии меню pmDashboard'); + render(done) + }) + }); + +}) + +/** + * Тестирование поиска + */ +window.qunitTestsArray.push(function() +{ + + syncQUnit.addTest('Поиск projects', function ( assert ) + { + var done = assert.async(); + + $.when(spajs.open({ menuId:"projects/search/tar"})).done(function() + { + assert.ok(true, 'Успешно открыто меню search/projects'); + render(done) + }).fail(function() + { + assert.ok(false, 'Ошибка при открытиии меню search/projects'); + render(done) + }) + }); + + syncQUnit.addTest('Поиск templates', function ( assert ) + { + var done = assert.async(); + + $.when(spajs.open({ menuId:"templates/search/tar"})).done(function() + { + assert.ok(true, 'Успешно открыто меню search/templates'); + render(done) + }).fail(function() + { + assert.ok(false, 'Ошибка при открытиии меню search/templates'); + render(done) + }) + }); + + syncQUnit.addTest('Поиск hosts', function ( assert ) + { + var done = assert.async(); + + $.when(spajs.open({ menuId:"hosts/search/tar"})).done(function() + { + assert.ok(true, 'Успешно открыто меню search/hosts'); + render(done) + }).fail(function() + { + assert.ok(false, 'Ошибка при открытиии меню search/hosts'); + render(done) + }) + }); + + syncQUnit.addTest('Поиск groups', function ( assert ) + { + var done = assert.async(); + + $.when(spajs.open({ menuId:"groups/search/tar"})).done(function() + { + assert.ok(true, 'Успешно открыто меню search/groups'); + render(done) + }).fail(function() + { + assert.ok(false, 'Ошибка при открытиии меню search/groups'); + render(done) + }) + }); + + syncQUnit.addTest('Поиск history', function ( assert ) + { + var done = assert.async(); + + $.when(spajs.open({ menuId:"history/search/tar"})).done(function() + { + assert.ok(true, 'Успешно открыто меню search/history'); + render(done) + }).fail(function() + { + assert.ok(false, 'Ошибка при открытиии меню search/history'); + render(done) + }) + }); + + syncQUnit.addTest('Поиск inventories', function ( assert ) + { + var done = assert.async(); + + $.when(spajs.open({ menuId:"inventories/search/tar"})).done(function() + { + assert.ok(true, 'Успешно открыто меню search/inventories'); + render(done) + }).fail(function() + { + assert.ok(false, 'Ошибка при открытиии меню search/inventories'); + render(done) + }) + }); + + syncQUnit.addTest('Поиск users', function ( assert ) + { + var done = assert.async(); + + $.when(spajs.open({ menuId:"users/search/admin"})).done(function() + { + assert.ok(true, 'Успешно открыто меню search/users'); + render(done) + }).fail(function() + { + assert.ok(false, 'Ошибка при открытиии меню search/users'); + render(done) + }) + }); +}) + + /** * Тестирование history */ @@ -2529,5 +2940,19 @@ window.qunitTestsArray.push(function() }) }); + syncQUnit.addTest('cancelTask не существуещей таски', function ( assert ) + { + var done = assert.async(); + + $.when(pmHistory.cancelTask(99999)).done(function() + { + assert.ok(false, 'cancelTask выполнилось'); + render(done) + }).fail(function() + { + assert.ok(true, 'Ошибка cancelTask'); + render(done) + }) + }); }) diff --git a/polemarch/static/templates/jsonEditor.html b/polemarch/static/templates/jsonEditor.html index ee483693..b3af2182 100644 --- a/polemarch/static/templates/jsonEditor.html +++ b/polemarch/static/templates/jsonEditor.html @@ -170,11 +170,35 @@
        - <%- opt.title2 %>
        + <%- opt.title2 %>
        +
        + +
        - <% } %> -
        + <% } %> +
        +
        + +
        + +
        + This form accept variables in format `variableName=variable value` or in format `variableName:variable value` +
        +
        +
        +
        +
        -
        +
        -
        +
        Add varible
        +
        +
        + Add varibles +
        +
        <% if(!opt.noBox){ %>
        diff --git a/polemarch/static/templates/pmDashboard.html b/polemarch/static/templates/pmDashboard.html index b0ea3169..d275aeef 100644 --- a/polemarch/static/templates/pmDashboard.html +++ b/polemarch/static/templates/pmDashboard.html @@ -1,4 +1,20 @@ + + + - - - - - - diff --git a/polemarch/static/templates/pmItems.html b/polemarch/static/templates/pmItems.html index 3736a1d5..dc38a3ef 100644 --- a/polemarch/static/templates/pmItems.html +++ b/polemarch/static/templates/pmItems.html @@ -49,3 +49,233 @@ + + + + + + + + + + diff --git a/polemarch/static/templates/pmUsers.html b/polemarch/static/templates/pmUsers.html index 6cc3d47f..e69de29b 100644 --- a/polemarch/static/templates/pmUsers.html +++ b/polemarch/static/templates/pmUsers.html @@ -1,331 +0,0 @@ - - - - - - - - - - From 9ce2454d3008f84509d3adf921473f0ac24ab231 Mon Sep 17 00:00:00 2001 From: Sergey Klyuykov Date: Wed, 15 Nov 2017 10:48:49 +1000 Subject: [PATCH 034/110] Fix builds in py34 --- polemarch/api/v1/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/polemarch/api/v1/views.py b/polemarch/api/v1/views.py index 6c098560..6c42640d 100644 --- a/polemarch/api/v1/views.py +++ b/polemarch/api/v1/views.py @@ -295,7 +295,8 @@ def _get_count_by_user(self, model): return model.objects.all().count() def _get_history_stats(self, request): - qs = serializers.models.History.objects.user_filter(self.request.user) + qs = serializers.models.History.objects.all() + qs = qs.user_filter(self.request.user) return qs.stats(int(request.query_params.get("last", "14"))) def list(self, request, *args, **kwargs): From 87a6847b50f7d9bf2aa7ec7cb1cb56e6e08d394a Mon Sep 17 00:00:00 2001 From: Trapenok Victor Date: Wed, 15 Nov 2017 11:27:12 +1000 Subject: [PATCH 035/110] Merge origin/issue_plus_2and3_access into GUI --- polemarch/static/js/filedsLib.js | 67 +++++++++++++++++++++++ polemarch/static/templates/filedsLib.html | 55 +++++++++++++++++++ 2 files changed, 122 insertions(+) create mode 100644 polemarch/static/js/filedsLib.js create mode 100644 polemarch/static/templates/filedsLib.html diff --git a/polemarch/static/js/filedsLib.js b/polemarch/static/js/filedsLib.js new file mode 100644 index 00000000..892ba634 --- /dev/null +++ b/polemarch/static/js/filedsLib.js @@ -0,0 +1,67 @@ + +var filedsLib = {} + +filedsLib.returnString = function(str){ + return function(){ + return str; + } +} + +filedsLib.getFunctionValue = function(obj) +{ + if(typeof obj == "function") + { + return obj(); + } + + return obj; +} + + +/** + * Функции для рендера полей + * @type Object + */ +filedsLib.filed = function(){} + + +/** + * Для вывода текстового поля + * @type Object + */ +filedsLib.filed.simpleText = function(){} +filedsLib.filed.simpleText.type = "text"; + +/** + * Функция для рендера текстового поля + * @type Object + */ +filedsLib.filed.simpleText.render = function(pmObj, filed, item_id){ + + return spajs.just.render('filed_type_'+this.type, {pmObj:pmObj, filed:filed, item_id:item_id}) +} + +filedsLib.filed.simpleText.getValue = function(pmObj, filed){ + return $("#filed_"+filed.name).val(); +} + +/** + * Для ввода текста + * @type Object + */ +filedsLib.filed.text = inheritance(filedsLib.filed.simpleText) +filedsLib.filed.text.type = 'text' + +/** + * Для ввода пароля + * @type Object + */ +filedsLib.filed.password = inheritance(filedsLib.filed.simpleText) +filedsLib.filed.password.type = 'password' + +/** + * Для ввода пароля + * @type Object + */ +filedsLib.filed.boolean = inheritance(filedsLib.filed.simpleText) +filedsLib.filed.boolean.type = 'boolean' diff --git a/polemarch/static/templates/filedsLib.html b/polemarch/static/templates/filedsLib.html new file mode 100644 index 00000000..5af789e3 --- /dev/null +++ b/polemarch/static/templates/filedsLib.html @@ -0,0 +1,55 @@ + + + + + + + + + + \ No newline at end of file From d895803eccd9cf7c022e2f41ed7be6655ac5ac2c Mon Sep 17 00:00:00 2001 From: cepreu Date: Wed, 15 Nov 2017 14:29:18 +1000 Subject: [PATCH 036/110] WIP at usergroups - history --- polemarch/api/v1/views.py | 3 +++ polemarch/main/models/tasks.py | 23 +++++++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/polemarch/api/v1/views.py b/polemarch/api/v1/views.py index 6c42640d..6e8a689e 100644 --- a/polemarch/api/v1/views.py +++ b/polemarch/api/v1/views.py @@ -153,6 +153,9 @@ class HistoryViewSet(base.HistoryModelViewSet): serializer_class_one = serializers.OneHistorySerializer filter_class = filters.HistoryFilter + def get_extra_queryset(self): + return self.queryset.user_filter(self.request.user) + @detail_route(methods=["get"]) def raw(self, request, *args, **kwargs): result = self.get_serializer(self.get_object()).get_raw(request) diff --git a/polemarch/main/models/tasks.py b/polemarch/main/models/tasks.py index 52c677b9..0348d945 100644 --- a/polemarch/main/models/tasks.py +++ b/polemarch/main/models/tasks.py @@ -237,8 +237,16 @@ def stats(self, last): def user_filter(self, user, only_leads=False): # pylint: disable=unused-argument - # TODO: this should be change - return self + prj_viewable = Project.objects.all().user_filter(user) + inv_viewable = Inventory.objects.all().user_filter(user) + inv_editable = inv_viewable.filter(permissions__role="EDITOR") + prj_editable = prj_viewable.filter(permissions__role="EDITOR") + return self.filter( + Q(project__in=prj_editable) | + Q(inventory__in=inv_editable) | + Q(initiator=user.id, initiator_type="users") | + Q(project__in=prj_viewable, inventory__in=inv_viewable) + ) class History(BModel): @@ -323,6 +331,17 @@ def write_line(self, value, number): # nocv history=self, line_number=number, line=value ) + def editable_by(self, user): + return self.inventory.editable_by(user) + + def viewable_by(self, user): + return ( + self.project.editable_by(user) or + self.inventory.editable_by(user) or + (self.initiator == user.id and self.initiator_type == "users") or + (self.project.viewable_by(user) & self.inventory.viewable_by(user)) + ) + class HistoryLines(BModel): line = models.TextField(default="") From 60ec8d7328da43db6448820671c47df0d3dcaa23 Mon Sep 17 00:00:00 2001 From: cepreu Date: Wed, 15 Nov 2017 17:29:59 +1000 Subject: [PATCH 037/110] WIP at usergroups - initial PeriodicTasks [ci skip] --- polemarch/api/v1/views.py | 3 +++ polemarch/main/models/tasks.py | 16 +++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/polemarch/api/v1/views.py b/polemarch/api/v1/views.py index 6e8a689e..029b6fdf 100644 --- a/polemarch/api/v1/views.py +++ b/polemarch/api/v1/views.py @@ -146,6 +146,9 @@ class PeriodicTaskViewSet(base.ModelViewSetSet): serializer_class_one = serializers.OnePeriodictaskSerializer filter_class = filters.PeriodicTaskFilter + def get_extra_queryset(self): + return self.queryset.user_filter(self.request.user) + class HistoryViewSet(base.HistoryModelViewSet): model = serializers.models.History diff --git a/polemarch/main/models/tasks.py b/polemarch/main/models/tasks.py index 0348d945..a9edc6f3 100644 --- a/polemarch/main/models/tasks.py +++ b/polemarch/main/models/tasks.py @@ -43,9 +43,17 @@ def __unicode__(self): return str(self.name) # nocv +class PeriodicTaskQuerySet(BQuerySet): + use_for_related_fields = True + + def user_filter(self, user, only_leads=False): + # pylint: disable=unused-argument + return self.filter(project__in=Project.objects.all().user_filter(user)) + + # noinspection PyTypeChecker class PeriodicTask(AbstractModel): - objects = BManager.from_queryset(AbstractVarsQuerySet)() + objects = PeriodicTaskQuerySet.as_manager() project = models.ForeignKey(Project, on_delete=models.CASCADE, related_query_name="periodic_tasks", blank=True, null=True) @@ -119,6 +127,12 @@ def run_ansible_playbook(self): save_result=self.save_result, **self.vars ) + def editable_by(self, user): + return self.project.editable_by(user) + + def viewable_by(self, user): + return self.project.viewable_by(user) + class Template(ACLModel): name = models.CharField(max_length=512) From d2ff137f3840fdce797c191ca2dcff1f41bf517a Mon Sep 17 00:00:00 2001 From: cepreu Date: Thu, 16 Nov 2017 11:38:27 +1000 Subject: [PATCH 038/110] WIP at usergroups - PeriodicTasks --- polemarch/main/models/tasks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/polemarch/main/models/tasks.py b/polemarch/main/models/tasks.py index a9edc6f3..db3ab189 100644 --- a/polemarch/main/models/tasks.py +++ b/polemarch/main/models/tasks.py @@ -21,7 +21,7 @@ from ..utils import AnsibleArgumentsReference from . import Inventory from ..exceptions import DataNotReady, NotApplicable -from .base import BModel, BManager, BQuerySet, models +from .base import BModel, BQuerySet, models from .vars import AbstractModel, AbstractVarsQuerySet from .projects import Project from .acl import ACLModel @@ -43,7 +43,7 @@ def __unicode__(self): return str(self.name) # nocv -class PeriodicTaskQuerySet(BQuerySet): +class PeriodicTaskQuerySet(AbstractVarsQuerySet): use_for_related_fields = True def user_filter(self, user, only_leads=False): From 6e49e3f88793103deee34c753c8db68d10769046 Mon Sep 17 00:00:00 2001 From: cepreu Date: Thu, 16 Nov 2017 12:12:08 +1000 Subject: [PATCH 039/110] WIP at usergroups - Tasks --- polemarch/api/base.py | 4 +++- polemarch/api/v1/views.py | 12 +++--------- polemarch/main/models/tasks.py | 20 +++++++++++++------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/polemarch/api/base.py b/polemarch/api/base.py index 12195316..1f56526f 100644 --- a/polemarch/api/base.py +++ b/polemarch/api/base.py @@ -109,10 +109,12 @@ def filter(self, request): ) -class PermissionMixin(object): +class LimitedPermissionMixin(object): def get_extra_queryset(self): return self.queryset.user_filter(self.request.user) + +class PermissionMixin(LimitedPermissionMixin): @detail_route(methods=["put", "get"]) def owner(self, request, pk=None): # pylint: disable=unused-argument diff --git a/polemarch/api/v1/views.py b/polemarch/api/v1/views.py index 029b6fdf..8ca8be29 100644 --- a/polemarch/api/v1/views.py +++ b/polemarch/api/v1/views.py @@ -133,32 +133,26 @@ def execute_module(self, request, *args, **kwargs): return serializer.execute_module(request).resp -class TaskViewSet(base.ReadOnlyModelViewSet): +class TaskViewSet(base.LimitedPermissionMixin, base.ReadOnlyModelViewSet): model = serializers.models.Task serializer_class = serializers.TaskSerializer serializer_class_one = serializers.OneTaskSerializer filter_class = filters.TaskFilter -class PeriodicTaskViewSet(base.ModelViewSetSet): +class PeriodicTaskViewSet(base.LimitedPermissionMixin, base.ModelViewSetSet): model = serializers.models.PeriodicTask serializer_class = serializers.PeriodictaskSerializer serializer_class_one = serializers.OnePeriodictaskSerializer filter_class = filters.PeriodicTaskFilter - def get_extra_queryset(self): - return self.queryset.user_filter(self.request.user) - -class HistoryViewSet(base.HistoryModelViewSet): +class HistoryViewSet(base.LimitedPermissionMixin, base.HistoryModelViewSet): model = serializers.models.History serializer_class = serializers.HistorySerializer serializer_class_one = serializers.OneHistorySerializer filter_class = filters.HistoryFilter - def get_extra_queryset(self): - return self.queryset.user_filter(self.request.user) - @detail_route(methods=["get"]) def raw(self, request, *args, **kwargs): result = self.get_serializer(self.get_object()).get_raw(request) diff --git a/polemarch/main/models/tasks.py b/polemarch/main/models/tasks.py index db3ab189..6f57f919 100644 --- a/polemarch/main/models/tasks.py +++ b/polemarch/main/models/tasks.py @@ -29,8 +29,16 @@ logger = logging.getLogger("polemarch") +class TaskFilterQuerySet(BQuerySet): + use_for_related_fields = True + + def user_filter(self, user): + return self.filter(project__in=Project.objects.all().user_filter(user)) + + # Block of real models class Task(BModel): + objects = TaskFilterQuerySet.as_manager() project = models.ForeignKey(Project, on_delete=models.CASCADE, related_query_name="tasks") name = models.CharField(max_length=256, default=uuid.uuid1) @@ -42,13 +50,12 @@ class Meta: def __unicode__(self): return str(self.name) # nocv + def viewable_by(self, user): + return self.project.viewable_by(user) -class PeriodicTaskQuerySet(AbstractVarsQuerySet): - use_for_related_fields = True - def user_filter(self, user, only_leads=False): - # pylint: disable=unused-argument - return self.filter(project__in=Project.objects.all().user_filter(user)) +class PeriodicTaskQuerySet(TaskFilterQuerySet, AbstractVarsQuerySet): + pass # noinspection PyTypeChecker @@ -249,8 +256,7 @@ def stats(self, last): year=self._get_history_stats_by(qs, 'year') ) - def user_filter(self, user, only_leads=False): - # pylint: disable=unused-argument + def user_filter(self, user): prj_viewable = Project.objects.all().user_filter(user) inv_viewable = Inventory.objects.all().user_filter(user) inv_editable = inv_viewable.filter(permissions__role="EDITOR") From 78e95a9b8e255135050852c66e6285cbe6efef65 Mon Sep 17 00:00:00 2001 From: Trapenok Victor Date: Thu, 16 Nov 2017 13:06:31 +1000 Subject: [PATCH 040/110] fix placeholder --- polemarch/static/templates/pmGroups.html | 4 ++-- polemarch/static/templates/pmInventories.html | 4 ++-- polemarch/static/templates/pmProjects.html | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/polemarch/static/templates/pmGroups.html b/polemarch/static/templates/pmGroups.html index 4a2c03e0..59a59e54 100644 --- a/polemarch/static/templates/pmGroups.html +++ b/polemarch/static/templates/pmGroups.html @@ -273,7 +273,7 @@

        - <% for(var i in pmGroups.model.itemslist.results){ %> <% if(item_id != pmGroups.model.itemslist.results[i].id ){ %>

        - - - - - + + - - - - - - - diff --git a/polemarch/static/templates/pmModuleTemplates.html b/polemarch/static/templates/pmModuleTemplates.html index 53c3c3ef..2a824661 100644 --- a/polemarch/static/templates/pmModuleTemplates.html +++ b/polemarch/static/templates/pmModuleTemplates.html @@ -48,8 +48,7 @@

        - <% for(var i in pmProjects.model.itemslist.results){ %>

        -
        - Create +
        + <% if(pmObj.model.page_list.buttons){ %> + <% for(var i in pmObj.model.page_list.buttons){ %> + <% if(pmObj.model.page_list.buttons[i].tpl){ %> + <%= pmObj.model.page_list.buttons[i].tpl.apply(pmObj, []) %> + <% }else{ %> + + <% if(typeof pmObj.model.page_list.buttons[i].title == 'function'){ %> + <%= pmObj.model.page_list.buttons[i].title.apply(pmObj, []) %> + <% }else{ %> + <%= pmObj.model.page_list.buttons[i].title %> + <% } %> + + <% } %> + <% } %> + <% } %>

        @@ -206,6 +228,29 @@

        + <% if(pmObj.model.page_new.buttons){ %> + <% for(var i in pmObj.model.page_new.buttons){ %> + <% if(pmObj.model.page_new.buttons[i].tpl){ %> + <%= pmObj.model.page_new.buttons[i].tpl.apply(pmObj) %> + <% }else{ %> + + <% if(typeof pmObj.model.page_new.buttons[i].title == 'function'){ %> + <%= pmObj.model.page_new.buttons[i].title.apply(pmObj, []) %> + <% }else{ %> + <%= pmObj.model.page_new.buttons[i].title %> + <% } %> + + <% } %> + <% } %> + <% } %>

        @@ -251,28 +296,34 @@

        1. Home
          2. -
        2. <%= pmObj.model.page_item.short_title.apply(pmObj, [item_id]) %>
          3. +
        3. <%= pmObj.model.page_item.page_list %>
        4. <%= pmObj.model.page_item.short_title.apply(pmObj, [item_id]) %>
        - <% for(var i in pmObj.model.page_item.buttons){ %> - - <% if(typeof pmObj.model.page_item.buttons[i].title == 'function'){ %> - <%= pmObj.model.page_item.buttons[i].title.apply(pmObj, [item_id]) %> - <% }else{ %> - <%= pmObj.model.page_item.buttons[i].title %> - <% } %> - + <% if(pmObj.model.page_item.buttons){ %> + <% for(var i in pmObj.model.page_item.buttons){ %> + <% if(pmObj.model.page_item.buttons[i].tpl){ %> + <%= pmObj.model.page_item.buttons[i].tpl.apply(pmObj, [item_id]) %> + <% }else{ %> + + <% if(typeof pmObj.model.page_item.buttons[i].title == 'function'){ %> + <%= pmObj.model.page_item.buttons[i].title.apply(pmObj, [item_id]) %> + <% }else{ %> + <%= pmObj.model.page_item.buttons[i].title %> + <% } %> + + <% } %> + <% } %> <% } %>

        From 8725b934d55ec11759a877a62e6b217d0755be5c Mon Sep 17 00:00:00 2001 From: Sergey Klyuykov Date: Mon, 20 Nov 2017 18:15:02 +1000 Subject: [PATCH 049/110] Add hooks model and handlers (with unittests) cloud/polemarchplus#8 --- polemarch/main/hooks/base.py | 19 ++++- polemarch/main/hooks/http.py | 20 +++++- polemarch/main/hooks/script.py | 19 ++++- .../migrations/0025_auto_20171120_1126.py | 47 ++++++++++++ polemarch/main/models/__init__.py | 1 + polemarch/main/models/hooks.py | 18 +++++ polemarch/main/unittests/__init__.py | 1 + polemarch/main/unittests/hooks.py | 71 +++++++++++++++++++ polemarch/main/utils.py | 9 ++- requirements.txt | 3 + 10 files changed, 199 insertions(+), 9 deletions(-) create mode 100644 polemarch/main/migrations/0025_auto_20171120_1126.py create mode 100644 polemarch/main/models/hooks.py create mode 100644 polemarch/main/unittests/hooks.py diff --git a/polemarch/main/hooks/base.py b/polemarch/main/hooks/base.py index 63b59be4..549af075 100644 --- a/polemarch/main/hooks/base.py +++ b/polemarch/main/hooks/base.py @@ -1,10 +1,23 @@ import json +from django.conf import settings class BaseHook(object): + def __init__(self, hook_object, **kwargs): + self.when = None + recipients = hook_object.recipients.split(' | ') + self.setup(recipients=recipients, **kwargs) - def send(self, message): - raise NotImplementedError() + def get_settings(self, name, default=None): # nocv + return getattr(settings, name, default) + + def setup(self, **kwargs): + self.conf = dict() + self.conf.update(kwargs) + + def send(self, message, when): + # pylint: disable=unused-argument + self.when = when def on_execution(self, **kwargs): - return self.send(json.dumps(kwargs)) + return self.send(json.dumps(kwargs), when='on_execution') diff --git a/polemarch/main/hooks/http.py b/polemarch/main/hooks/http.py index bdb7216a..d602a2e5 100644 --- a/polemarch/main/hooks/http.py +++ b/polemarch/main/hooks/http.py @@ -1,6 +1,22 @@ +import json +import requests from .base import BaseHook class Backend(BaseHook): - def send(self, message): - return + def _execute(self, url, when, message): + data = dict(type=when, payload=json.loads(message)) + try: + response = requests.post(url, data=data) + return "{} {}: {}".format( + response.status_code, response.reason, response.text + ) + except BaseException as err: + return str(err) + + def send(self, message, when): + super(Backend, self).send(message, when) + return "\n".join([ + self._execute(r, when, message) + for r in self.conf['recipients'] if r + ]) diff --git a/polemarch/main/hooks/script.py b/polemarch/main/hooks/script.py index bdb7216a..12eabe41 100644 --- a/polemarch/main/hooks/script.py +++ b/polemarch/main/hooks/script.py @@ -1,6 +1,21 @@ +from subprocess import check_output from .base import BaseHook +from ..utils import tmp_file_context class Backend(BaseHook): - def send(self, message): - return + + def _execute(self, script, when, file): + try: + return check_output([script, when, file.name]) + except BaseException as err: + return str(err) + + def send(self, message, when): + super(Backend, self).send(message, when) + with tmp_file_context() as file: + file.write(message) + return "\n".join([ + self._execute(r, when, file) + for r in self.conf['recipients'] if r + ]) diff --git a/polemarch/main/migrations/0025_auto_20171120_1126.py b/polemarch/main/migrations/0025_auto_20171120_1126.py new file mode 100644 index 00000000..6581a213 --- /dev/null +++ b/polemarch/main/migrations/0025_auto_20171120_1126.py @@ -0,0 +1,47 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.4 on 2017-11-20 01:26 +from __future__ import unicode_literals + +from django.db import migrations, models +import polemarch.main.models.base + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0024_migrate_templates'), + ] + + operations = [ + migrations.CreateModel( + name='Hook', + fields=[ + ('id', models.AutoField(max_length=20, primary_key=True, serialize=False)), + ('type', models.CharField(max_length=32)), + ('recipients', models.TextField()), + ], + options={ + 'abstract': False, + }, + ), + migrations.AlterField( + model_name='group', + name='parents', + field=polemarch.main.models.base.ManyToManyFieldACLReverse(blank=True, null=True, related_name='groups', related_query_name='childrens', to='main.Group'), + ), + migrations.AlterField( + model_name='inventory', + name='groups', + field=polemarch.main.models.base.ManyToManyFieldACL(related_name='inventories', to='main.Group'), + ), + migrations.AlterField( + model_name='project', + name='groups', + field=polemarch.main.models.base.ManyToManyFieldACL(blank=True, null=True, related_name='projects', to='main.Group'), + ), + migrations.AlterField( + model_name='project', + name='inventories', + field=polemarch.main.models.base.ManyToManyFieldACL(blank=True, null=True, related_name='projects', to='main.Inventory'), + ), + ] diff --git a/polemarch/main/models/__init__.py b/polemarch/main/models/__init__.py index c4440444..14a57579 100644 --- a/polemarch/main/models/__init__.py +++ b/polemarch/main/models/__init__.py @@ -15,6 +15,7 @@ from .projects import Project from .users import UserGroup, ACLPermission from .tasks import Task, PeriodicTask, History, HistoryLines, Template +from .hooks import Hook from ..validators import RegexValidator from ..exceptions import UnknownTypeException from ..utils import raise_context, AnsibleArgumentsReference diff --git a/polemarch/main/models/hooks.py b/polemarch/main/models/hooks.py new file mode 100644 index 00000000..2145afee --- /dev/null +++ b/polemarch/main/models/hooks.py @@ -0,0 +1,18 @@ +from __future__ import unicode_literals +from .base import BModel, models +from ..utils import ModelHandlers, raise_context + + +class HookHandlers(ModelHandlers): + @raise_context(AttributeError, exclude=True) + def handle(self, name, obj, when, **kwargs): + return getattr(self.get_object(name, obj), when)(**kwargs) + + +class Hook(BModel): + handlers = HookHandlers("HOOKS", "'type' needed!") + type = models.CharField(max_length=32, null=False) + recipients = models.TextField() + + def run(self, when='on_execution', **kwargs): + return self.handlers.handle(self.type, self, when, **kwargs) diff --git a/polemarch/main/unittests/__init__.py b/polemarch/main/unittests/__init__.py index d99659b9..cd316ede 100644 --- a/polemarch/main/unittests/__init__.py +++ b/polemarch/main/unittests/__init__.py @@ -4,3 +4,4 @@ from .modelrelatedfield import ModelRelatedFieldTestCase from .executor import ExecutorTestCase from .routers import RoutersTestCase +from .hooks import HooksTestCase diff --git a/polemarch/main/unittests/hooks.py b/polemarch/main/unittests/hooks.py new file mode 100644 index 00000000..13c89a5a --- /dev/null +++ b/polemarch/main/unittests/hooks.py @@ -0,0 +1,71 @@ +import json +try: + from mock import patch +except ImportError: # nocv + from unittest.mock import patch +from django.test import TestCase +from requests import Response +from polemarch.main.models import Hook +from polemarch.main.utils import tmp_file_context + + +class HooksTestCase(TestCase): + def check_output_run(self, check_data, *args, **kwargs): + # pylint: disable=unused-argument + self.assertEqual(check_data[0], self.recipients[self.count]) + self.assertEqual(check_data[1], 'on_execution') + with open(check_data[2], 'r') as file: + message = json.load(file) + self.assertEqual(message.get('test', None), 'test') + self.count += 1 + return "Ok" + + def check_output_error(self, *args, **kwargs): + # pylint: disable=unused-argument + raise Exception("Err") + + def test_script(self): + self.recipients = ['test.sh', 'send.sh'] + hook = Hook.objects.create( + type='SCRIPT', recipients=" | ".join(self.recipients) + ) + with patch('subprocess.check_output') as cmd: + self.count = 0 + cmd.side_effect = self.check_output_run + self.assertEqual(hook.run(test="test"), "Ok\nOk") + self.assertEquals(cmd.call_count, 2) + hook.run('on_error', test="test") + self.assertEquals(cmd.call_count, 2) + cmd.side_effect = self.check_output_error + self.assertEqual(hook.run(test="test"), "Err\nErr") + self.assertEquals(cmd.call_count, 4) + + def check_output_run_http(self, method, url, data, **kwargs): + # pylint: disable=protected-access, unused-argument + self.assertEqual(method, "post") + with tmp_file_context() as file: + file.write(json.dumps(data['payload'])) + self.check_output_run([url, data['type'], file.name]) + the_response = Response() + the_response.reason = "ok" + the_response.status_code = 200 + the_response._content = b'{ "result" : "ok" }' + return the_response + + def test_http(self): + self.recipients = ['http://test.lan', 'https://example.com'] + hook = Hook.objects.create( + type='HTTP', recipients=" | ".join(self.recipients) + ) + with patch('requests.api.request') as cmd: + self.count = 0 + cmd.side_effect = self.check_output_run_http + result = hook.run(test="test") + for res in result.split("\n"): + self.assertEqual(res, '200 ok: { "result" : "ok" }') + self.assertEquals(cmd.call_count, 2) + hook.run('on_error', test="test") + self.assertEquals(cmd.call_count, 2) + cmd.side_effect = self.check_output_error + self.assertEqual(hook.run(test="test"), "Err\nErr") + self.assertEquals(cmd.call_count, 4) diff --git a/polemarch/main/utils.py b/polemarch/main/utils.py index ec98ae9d..25afd228 100644 --- a/polemarch/main/utils.py +++ b/polemarch/main/utils.py @@ -445,21 +445,26 @@ def __init__(self, *args, **kwargs): :param verbose: -- logging :type verbose: bool ''' + self._kwargs = dict(**kwargs) self._verbose = kwargs.pop("verbose", False) + self._exclude = kwargs.pop("exclude", False) self._excepts = tuple(args) def __enter__(self): return self # pragma: no cover def __exit__(self, exc_type, exc_val, exc_tb): - return exc_type is not None and not issubclass(exc_type, self._excepts) + return exc_type is not None and ( + (not self._exclude and not issubclass(exc_type, self._excepts)) or + (self._exclude and issubclass(exc_type, self._excepts)) + ) # noinspection PyUnreachableCode class raise_context(assertRaises): def execute(self, func, *args, **kwargs): - with self.__class__(self._excepts, verbose=self._verbose): + with self.__class__(self._excepts, **self._kwargs): return func(*args, **kwargs) return sys.exc_info() diff --git a/requirements.txt b/requirements.txt index 81622fd5..8e956050 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,6 +19,9 @@ uWSGI==2.0.15 # Repo types gitpython==2.1.7 +# Hooks +requests==2.18.4 + # additional DB and cache connectors PyMySQL python-memcached \ No newline at end of file From 273ceff34d78a0f027b99c7d8432ba5cd7ffbbae Mon Sep 17 00:00:00 2001 From: cepreu Date: Mon, 20 Nov 2017 19:17:31 +1000 Subject: [PATCH 050/110] WIP at usergroups - templates & fields check --- polemarch/api/handlers.py | 3 ++- polemarch/main/models/acl.py | 3 +++ polemarch/main/models/acl_models.py | 4 ++++ polemarch/main/models/hosts.py | 7 ++++++- polemarch/main/models/tasks.py | 7 ++++--- polemarch/main/settings.py | 1 + 6 files changed, 20 insertions(+), 5 deletions(-) diff --git a/polemarch/api/handlers.py b/polemarch/api/handlers.py index 6bc286da..9e33fbbe 100644 --- a/polemarch/api/handlers.py +++ b/polemarch/api/handlers.py @@ -2,6 +2,7 @@ import sys import traceback import six +from django.core.exceptions import PermissionDenied from django.http import Http404 from django.core import exceptions as djexcs @@ -24,7 +25,7 @@ def polemarch_exception_handler(exc, context): data = {'detail': six.text_type(msg)} return Response(data, status=status.HTTP_404_NOT_FOUND) - elif isinstance(exc, PermissionError): + elif isinstance(exc, PermissionDenied): return Response({"detail": str(exc)}, status=status.HTTP_403_FORBIDDEN) diff --git a/polemarch/main/models/acl.py b/polemarch/main/models/acl.py index c4af073e..cd953c70 100644 --- a/polemarch/main/models/acl.py +++ b/polemarch/main/models/acl.py @@ -16,3 +16,6 @@ ACLQuerySet = import_class( settings.ACL['DEFAULT_ACL_CLASSES']["ACLQuerySet"] ) +ACLInventoriesQuerySet = import_class( + settings.ACL['DEFAULT_ACL_CLASSES']["ACLInventoriesQuerySet"] +) diff --git a/polemarch/main/models/acl_models.py b/polemarch/main/models/acl_models.py index 45b64c52..9f8f9080 100644 --- a/polemarch/main/models/acl_models.py +++ b/polemarch/main/models/acl_models.py @@ -28,6 +28,10 @@ def user_filter(self, user, only_leads=False): return self +class ACLInventoriesQuerySet(ACLQuerySet): + pass + + class ACLPermissionSubclass(models.Model): owner = models.ForeignKey(settings.AUTH_USER_MODEL, default=first_staff_user, diff --git a/polemarch/main/models/hosts.py b/polemarch/main/models/hosts.py index 9d19a91c..cdc50b81 100644 --- a/polemarch/main/models/hosts.py +++ b/polemarch/main/models/hosts.py @@ -5,6 +5,7 @@ from django.db import transaction from django.db.models import Q +from polemarch.main.models.acl import ACLInventoriesQuerySet from .base import BManager, models from .base import ManyToManyFieldACL, ManyToManyFieldACLReverse @@ -137,8 +138,12 @@ def toString(self, var_sep="\n"): return get_render("models/group", data), keys +class InventoriesQuerySet(ACLInventoriesQuerySet, AbstractVarsQuerySet): + pass + + class Inventory(AbstractModel): - objects = BManager.from_queryset(AbstractVarsQuerySet)() + objects = InventoriesQuerySet.as_manager() hosts = ManyToManyFieldACL(Host) groups = ManyToManyFieldACL(Group) diff --git a/polemarch/main/models/tasks.py b/polemarch/main/models/tasks.py index 6f57f919..8a92955e 100644 --- a/polemarch/main/models/tasks.py +++ b/polemarch/main/models/tasks.py @@ -17,6 +17,7 @@ from django.contrib.auth.models import User from django.db.models import functions as dbfunc, Count from django.utils.timezone import now +from polemarch.main.models.base import ForeignKeyACL from ..utils import AnsibleArgumentsReference from . import Inventory @@ -147,9 +148,9 @@ class Template(ACLModel): template_data = models.TextField(default="") inventory = models.CharField(max_length=128, default=None, blank=True, null=True) - project = models.ForeignKey(Project, - on_delete=models.SET_NULL, - default=None, blank=True, null=True) + project = ForeignKeyACL(Project, + on_delete=models.SET_NULL, + default=None, blank=True, null=True) class Meta: index_together = [ diff --git a/polemarch/main/settings.py b/polemarch/main/settings.py index d2c3f89d..38334a08 100644 --- a/polemarch/main/settings.py +++ b/polemarch/main/settings.py @@ -382,6 +382,7 @@ "ACLPermissionSubclass": "polemarch.main.models.acl_models.ACLPermissionSubclass", "ACLGroupSubclass": "polemarch.main.models.acl_models.ACLGroupSubclass", "ACLQuerySet": "polemarch.main.models.acl_models.ACLQuerySet", + "ACLInventoriesQuerySet": "polemarch.main.models.acl_models.ACLInventoriesQuerySet", } } From 57d54bd159bc6427c2605f392ffcb1b0f64ec017 Mon Sep 17 00:00:00 2001 From: Trapenok Victor Date: Tue, 21 Nov 2017 11:24:51 +1000 Subject: [PATCH 051/110] refactoring for projects --- polemarch/static/js/pmProjects.js | 429 +++++++++----- polemarch/static/js/tests/qUnitTest.js | 2 +- polemarch/static/templates/pmItems.html | 38 +- polemarch/static/templates/pmProjects.html | 626 +++------------------ 4 files changed, 399 insertions(+), 696 deletions(-) diff --git a/polemarch/static/js/pmProjects.js b/polemarch/static/js/pmProjects.js index 4f18dc3e..92b53a38 100644 --- a/polemarch/static/js/pmProjects.js +++ b/polemarch/static/js/pmProjects.js @@ -1,9 +1,12 @@ var pmProjects = inheritance(pmItems) + pmProjects.model.name = "projects" +pmProjects.model.page_name = "project" +pmProjects.model.className = "pmProjects" + jsonEditor.options[pmProjects.model.name] = {}; pmProjects.model.selectedInventory = 0 -pmProjects.model.className = "pmProjects" jsonEditor.options[pmProjects.model.name]['repo_password'] = { type:'password', @@ -11,6 +14,257 @@ jsonEditor.options[pmProjects.model.name]['repo_password'] = { helpcontent:'Password from repository required for GIT' } +/** + * Для ввода пароля + * @type Object + */ +pmProjects.filed.selectRepositoryType = inheritance(filedsLib.filed.simpleText) +pmProjects.filed.selectRepositoryType.type = 'selectRepositoryType' + +filedsLib.filed.simpleText.getValue = function(pmObj, filed){ + return ''; +} + + +pmProjects.model.page_list = { + buttons:[ + { + class:'btn btn-primary', + function:function(){ return "spajs.open({ menuId:'new-"+this.model.page_name+"}); return false;"}, + title:'Create', + link:function(){ return '/?new-'+this.model.page_name}, + }, + ], + title: "Projects", + short_title: "Projects", + fileds:[ + { + title:'Name', + name:'name', + }, + { + title:'Status', + name:'status', + style:function(item){ return 'style="width: 110px"'}, + class:function(item) + { + if(!item) + { + return 'class="hidden-xs hidden-sm"'; + } + + return 'class="hidden-xs hidden-sm project-status ' + + this.model.items[item.id].justClassName('status', function(v){ return "project-status-"+v})+'"' + }, + value:function(item, filed){ + return item.justText(filed) + }, + } + ], + actions:[ + { + class:'btn btn-default', + function:function(item){ return 'spajs.showLoader('+this.model.className+'.syncRepo('+item.id+')); return false;'}, + title:'Sync', + link:function(){ return '#'} + }, + { + // separator + }, + { + function:function(item){ return "spajs.open({ menuId:'project/"+item.id+"/playbook/run'}); return false;"}, + title:'Run playbook', + link:function(){ return '#'} + }, + { + function:function(item){ return "spajs.open({ menuId:'project/"+item.id+"/ansible-module/run'}); return false;"}, + title:'Run ansible module', + link:function(){ return '#'} + }, + { + function:function(item){ return "spajs.open({ menuId:'project/"+item.id+"/periodic-tasks'}); return false;"}, + title:'Periodic tasks', + link:function(){ return '#'} + }, + { + function:function(item){ return "spajs.open({ menuId:'project/"+item.id+"/history'}); return false;"}, + title:'History', + link:function(){ return '#'} + }, + { + // separator + }, + { + class:'btn btn-danger', + function:function(item){ return 'spajs.showLoader('+this.model.className+'.deleteItem('+item.id+')); return false;'}, + title:'Delete', + link:function(){ return '#'} + }, + ] +} + +pmProjects.model.page_new = { + title: "New project", + short_title: "New project", + fileds:[ + [ + { + filed: new filedsLib.filed.text(), + title:'Name', + name:'name', + placeholder:'Project name', + help:'', + validator:function(value){ return value != '' && value}, + fast_validator:function(value){ return value != '' && value} + }, + { + filed: new pmProjects.filed.selectRepositoryType(), + name:'repository', + }, + ] + ], + onBeforeSave:function(data) + { + data.repository = $("#new_project_repository").val() + data.vars = { + repo_type:$("#new_project_type").val(), + repo_password:$("#new_project_password").val(), + } + + if(!data.repository) + { + if(data.vars.repo_type == "MANUAL") + { + data.repository = "MANUAL" + } + else + { + $.notify("Invalid value in field `Repository URL`", "error"); + return false; + } + } + + return data; + }, + onCreate:function(result) + { + var def = new $.Deferred(); + $.notify("Project created", "success"); + $.when(spajs.open({ menuId:this.model.page_name+"/"+result.id})).always(function(){ + def.resolve() + }) + + return def.promise(); + } +} + +pmProjects.model.page_item = { + buttons:[ + { + class:'btn btn-primary', + function:function(item_id){ return 'spajs.showLoader('+this.model.className+'.updateItem('+item_id+')); return false;'}, + title:'Save', + link:function(){ return '#'}, + }, + { + class:'btn btn-warning', + function:function(item_id){ return 'spajs.showLoader('+this.model.className+'.syncRepo('+item_id+')); return false;'}, + title:' Sync', + link:function(){ return '#'}, + help:'Sync' + }, + { + class:'btn btn-info', + function:function(item_id){ return 'return spajs.openURL(this.href);'}, + title:' Run playbook', + link:function(item_id){ return polemarch.opt.host +'/?project/'+ item_id + '/playbook/run'}, + help:'Run playbook' + }, + { + class:'btn btn-info', + function:function(item_id){ return 'return spajs.openURL(this.href);'}, + title:' Run module', + link:function(item_id){ return polemarch.opt.host +'/?project/'+ item_id + '/ansible-module/run'}, + help:'Run module' + }, + { + class:'btn btn-info', + function:function(item_id){ return 'return spajs.openURL(this.href);'}, + title:' Periodic tasks', + link:function(item_id){ return polemarch.opt.host +'/?project/'+ item_id + '/periodic-tasks'}, + help:'Periodic tasks' + }, + { + class:'btn btn-info', + function:function(item_id){ return 'return spajs.openURL(this.href);'}, + title:' History', + link:function(item_id){ return polemarch.opt.host +'/?project/'+ item_id + '/history'}, + help:'history' + }, + { + tpl:function(item_id){ + return spajs.just.render('pmTasksTemplates_btn_importFromFile', {item_id:item_id}) + }, + }, + { + class:'btn btn-danger danger-right', + function:function(item_id){ return 'spajs.showLoader('+this.model.className+'.deleteItem('+item_id+')); return false;'}, + title:' ', + link:function(){ return '#'}, + }, + ], + title: function(item_id){ + return "Project "+this.model.items[item_id].justText('name') + }, + short_title: function(item_id){ + return "Project "+this.model.items[item_id].justText('name', function(v){return v.slice(0, 20)}) + }, + fileds:[ + [ + { + filed: new filedsLib.filed.text(), + title:'Name', + name:'name', + placeholder:'Enter host or range name', + help:'Host or range name', + validator:function(value){ return value != '' && value}, + fast_validator:function(value){ return value != '' && value} + }, + { + filed: new pmProjects.filed.selectRepositoryType(), + name:'repository', + }, + ] + ], + onUpdate:function(result) + { + return true; + }, + onBeforeSave:function(data, item_id) + { + data.repository = $("#project_"+item_id+"_repository").val() + + data.vars = { + repo_type:$("#project_"+item_id+"_type").val(), + repo_password:$("#project_"+item_id+"_password").val(), + } + + if(!data.repository) + { + if(data.vars.repo_type == "MANUAL") + { + data.repository = "MANUAL" + } + else + { + $.notify("Invalid value in field `Repository URL`", "error"); + return false; + } + } + + return data; + }, +} pmProjects.openItem = function(holder, menuInfo, data) { @@ -45,9 +299,9 @@ pmProjects.openNewItemPage = function(holder, menuInfo, data) * @returns {$.Deferred} */ pmProjects.executePlaybook = function(project_id) -{ +{ var data_vars = jsonEditor.jsonEditorGetValues(); - data_vars.limit = pmGroups.getGroupsAutocompleteValue(); + data_vars.limit = pmGroups.getGroupsAutocompleteValue(); return pmTasks.execute(project_id, $('#inventories-autocomplete').val(), $('#playbook-autocomplete').val(), data_vars); } @@ -61,7 +315,7 @@ pmProjects.openRunPlaybookPage = function(holder, menuInfo, data) var thisObj = this; var project_id = data.reg[1] $.when(pmTasks.searchItems(project_id, "project"), pmProjects.loadItem(project_id), pmInventories.loadAllItems()).done(function() - { + { $(holder).insertTpl(spajs.just.render(thisObj.model.name+'_run_playbook', {item_id:project_id, query:project_id})) $("#inventories-autocomplete").select2({ width: '100%' }); @@ -80,7 +334,7 @@ pmProjects.openRunPlaybookPage = function(holder, menuInfo, data) { $("#playbook-autocomplete").val($(item).text()); //console.log('onSelect', term, item); - //var value = $(item).attr('data-value'); + //var value = $(item).attr('data-value'); }, source: function(term, response) { @@ -107,129 +361,10 @@ pmProjects.openRunPlaybookPage = function(holder, menuInfo, data) { def.reject(); }) - - return def.promise(); -} - -/** - * @return $.Deferred - */ -pmProjects.addItem = function() -{ - var def = new $.Deferred(); - var data = {} - - data.name = $("#new_project_name").val() - data.repository = $("#new_project_repository").val() - data.vars = { - repo_type:$("#new_project_type").val(), - repo_password:$("#new_project_password").val(), - } - - if(!data.repository) - { - if(data.vars.repo_type == "MANUAL") - { - data.repository = "MANUAL" - } - else - { - $.notify("Invalid value in field `Repository URL`", "error"); - def.reject() - return def.promise(); - } - } - - if(!data.name) - { - $.notify("Invalid value in field name", "error"); - def.reject() - return def.promise(); - } - - spajs.ajax.Call({ - url: "/api/v1/projects/", - type: "POST", - contentType:'application/json', - data: JSON.stringify(data), - success: function(data) - { - $.notify("project created", "success"); - $.when(spajs.open({ menuId:"project/"+data.id})).always(function(){ - def.resolve() - }) - }, - error:function(e) - { - def.reject() - polemarch.showErrors(e.responseJSON) - } - }); return def.promise(); } -/** - * @return $.Deferred - */ -pmProjects.updateItem = function(item_id) -{ - var def = new $.Deferred(); - var data = {} - - data.name = $("#project_"+item_id+"_name").val() - data.repository = $("#project_"+item_id+"_repository").val() - - if(!data.name) - { - console.warn("Invalid value in field name") - $.notify("Invalid value in field name", "error"); - def.reject("Invalid value in field name") - return def.promise(); - } - - data.vars = { - repo_type:$("#project_"+item_id+"_type").val(), - repo_password:$("#project_"+item_id+"_password").val(), - } - - if(!data.repository) - { - if(data.vars.repo_type == "MANUAL") - { - data.repository = "MANUAL" - } - else - { - $.notify("Invalid value in field `Repository URL`", "error"); - def.reject("Invalid value in field `Repository URL`") - return def.promise(); - } - } - - - var thisObj = this; - spajs.ajax.Call({ - url: "/api/v1/projects/"+item_id+"/", - type: "PATCH", - contentType:'application/json', - data:JSON.stringify(data), - success: function(data) - { - $.notify("Save", "success"); - thisObj.model.items[item_id] = data - def.resolve(item_id) - }, - error:function(e) - { - console.warn("project "+item_id+" update error - " + JSON.stringify(e)); - polemarch.showErrors(e.responseJSON) - def.reject(e) - } - }); - return def.promise(); -} - /** * Показывает форму со списком всех групп. * @return $.Deferred @@ -363,7 +498,7 @@ pmProjects.setSubInventories = function(item_id, inventories_ids) { pmProjects.model.items[item_id].inventories.push(pmInventories.model.items[inventories_ids[i]]) } - } + } $.notify("Save", "success"); }, error:function(e) @@ -398,7 +533,7 @@ pmProjects.setSubGroups = function(item_id, groups_ids) { pmProjects.model.items[item_id].groups.push(pmGroups.model.items[groups_ids[i]]) } - } + } $.notify("Save", "success"); }, error:function(e) @@ -467,14 +602,14 @@ pmProjects.addSubInventories = function(item_id, inventories_ids) def.reject() return; } - + if(pmProjects.model.items[item_id]) - { + { for(var i in inventories_ids) { pmProjects.model.items[item_id].inventories.push(pmInventories.model.items[inventories_ids[i]]) } - } + } $.notify("Save", "success"); def.resolve() }, @@ -512,14 +647,14 @@ pmProjects.addSubGroups = function(item_id, groups_ids) def.reject() return; } - + if(pmProjects.model.items[item_id]) - { + { for(var i in groups_ids) { pmProjects.model.items[item_id].groups.push(pmGroups.model.items[groups_ids[i]]) } - } + } $.notify("Save", "success"); def.resolve() }, @@ -556,9 +691,9 @@ pmProjects.addSubHosts = function(item_id, hosts_ids) def.reject() return; } - + if(pmProjects.model.items[item_id]) - { + { for(var i in hosts_ids) { pmProjects.model.items[item_id].hosts.push(pmHosts.model.items[hosts_ids[i]]) @@ -619,47 +754,47 @@ pmProjects.supportedRepos = function() }, error:function(e) { - console.warn("project "+item_id+" sync error - " + JSON.stringify(e)); + console.warn("supportedRepos error - " + JSON.stringify(e)); } }); } tabSignal.connect("polemarch.start", function() -{ +{ // projects spajs.addMenu({ - id:"projects", + id:"projects", urlregexp:[/^projects$/, /^projects\/search\/?$/, /^project$/, /^projects\/page\/([0-9]+)$/], onOpen:function(holder, menuInfo, data){return pmProjects.showUpdatedList(holder, menuInfo, data);}, onClose:function(){return pmProjects.stopUpdates();}, }) - + spajs.addMenu({ - id:"projects-search", + id:"projects-search", urlregexp:[/^projects\/search\/([A-z0-9 %\-.:,=]+)$/], onOpen:function(holder, menuInfo, data){return pmProjects.showSearchResults(holder, menuInfo, data);} }) - + spajs.addMenu({ - id:"project", - urlregexp:[/^project\/([0-9]+)$/, /^projects\/([0-9]+)$/], + id:"project", + urlregexp:[/^project\/([0-9]+)$/, /^projects\/([0-9]+)$/], onOpen:function(holder, menuInfo, data){return pmProjects.openItem(holder, menuInfo, data);} }) spajs.addMenu({ - id:"newProject", + id:"newProject", urlregexp:[/^new-project$/], onOpen:function(holder, menuInfo, data){return pmProjects.openNewItemPage(holder, menuInfo, data);} }) - + spajs.addMenu({ - id:"project-run-playbook", + id:"project-run-playbook", urlregexp:[/^project\/([0-9]+)\/playbook\/run$/], onOpen:function(holder, menuInfo, data){return pmProjects.openRunPlaybookPage(holder, menuInfo, data);} }) - + spajs.addMenu({ - id:"project-ansible-module-run", + id:"project-ansible-module-run", urlregexp:[/^project\/([0-9]+)\/ansible-module\/run$/], onOpen:function(holder, menuInfo, data){return pmAnsibleModule.showInProject(holder, menuInfo, data);} }) diff --git a/polemarch/static/js/tests/qUnitTest.js b/polemarch/static/js/tests/qUnitTest.js index 94c47eb5..f0b24ff0 100644 --- a/polemarch/static/js/tests/qUnitTest.js +++ b/polemarch/static/js/tests/qUnitTest.js @@ -1698,7 +1698,7 @@ window.qunitTestsArray.push(function() var done = assert.async(); // Заполнение формы с данными project - $("#new_project_name").val("test-project-"+t); + $("#filed_name").val("test-project-"+t); $("#new_project_repository").val("git://test-project-"+t); $("#new_json_nameprefix").val("test1"); diff --git a/polemarch/static/templates/pmItems.html b/polemarch/static/templates/pmItems.html index 6ab05ba6..6f650ce5 100644 --- a/polemarch/static/templates/pmItems.html +++ b/polemarch/static/templates/pmItems.html @@ -77,7 +77,7 @@

        <%- pmObj.model.page_list.buttons[i].class %> <% } %>" href="<%- pmObj.model.page_list.buttons[i].link.apply(pmObj, []) %>" - title="<%- pmObj.model.page_list.buttons[i].help %>" + title="<%- pmObj.model.page_list.buttons[i].help || '' %>" onclick="<%- pmObj.model.page_list.buttons[i].function.apply(pmObj, []) %>" > <% if(typeof pmObj.model.page_list.buttons[i].title == 'function'){ %> <%= pmObj.model.page_list.buttons[i].title.apply(pmObj, []) %> @@ -132,9 +132,13 @@

        <% if(pmObj.model.page_list.fileds[j].style){ %><%= pmObj.model.page_list.fileds[j].style.apply(pmObj, [pmObj.model.itemslist.results[i]]) %><% } %> <% if(pmObj.model.page_list.fileds[j].class){ %><%= pmObj.model.page_list.fileds[j].class.apply(pmObj, [pmObj.model.itemslist.results[i]]) %><% } %> > - + <%- pmObj.model.itemslist.results[i][pmObj.model.page_list.fileds[j].name] %> - + <% }else{ %> + <%= pmObj.model.page_list.fileds[j].value.apply(pmObj, [pmObj.model.itemslist.results[i], pmObj.model.page_list.fileds[j].name]) %> + <% } %> + <% } %>
        @@ -144,16 +148,20 @@

        @@ -240,7 +248,7 @@

        <%- pmObj.model.page_new.buttons[i].class %> <% } %>" href="<%- pmObj.model.page_new.buttons[i].link.apply(pmObj, [item_id]) %>" - title="<%- pmObj.model.page_new.buttons[i].help %>" + title="<%- pmObj.model.page_new.buttons[i].help || '' %>" onclick="<%- pmObj.model.page_new.buttons[i].function.apply(pmObj, []) %>" > <% if(typeof pmObj.model.page_new.buttons[i].title == 'function'){ %> <%= pmObj.model.page_new.buttons[i].title.apply(pmObj, []) %> @@ -314,7 +322,7 @@

        <%- pmObj.model.page_item.buttons[i].class %> <% } %>" href="<%- pmObj.model.page_item.buttons[i].link.apply(pmObj, [item_id]) %>" - title="<%- pmObj.model.page_item.buttons[i].help %>" + title="<%- pmObj.model.page_item.buttons[i].help || '' %>" onclick="<%- pmObj.model.page_item.buttons[i].function.apply(pmObj, [item_id]) %>" > <% if(typeof pmObj.model.page_item.buttons[i].title == 'function'){ %> <%= pmObj.model.page_item.buttons[i].title.apply(pmObj, [item_id]) %> diff --git a/polemarch/static/templates/pmProjects.html b/polemarch/static/templates/pmProjects.html index 823ee629..d7fcb514 100644 --- a/polemarch/static/templates/pmProjects.html +++ b/polemarch/static/templates/pmProjects.html @@ -1,547 +1,107 @@ - - - - - - - - - - - - - - - + - + + + + + + + + - - - - - - - - + diff --git a/polemarch/static/templates/pmInventories.html b/polemarch/static/templates/pmInventories.html index 43fc64df..371a525a 100644 --- a/polemarch/static/templates/pmInventories.html +++ b/polemarch/static/templates/pmInventories.html @@ -17,7 +17,7 @@ + value="<% if(/[^0-9]/mg.test(filed.getFiledValue.apply(pmObj, [item_id]))){ %><%- filed.getFiledValue.apply(pmObj, [item_id]) %><% } %>">

        From 55c309ef991c8166c70a3b2088d1ae14252b6c1c Mon Sep 17 00:00:00 2001 From: Trapenok Victor Date: Thu, 30 Nov 2017 13:24:45 +1000 Subject: [PATCH 102/110] fix bugs before release --- polemarch/static/js/filedsLib.js | 14 +++++++++++++- polemarch/static/js/pmGroups.js | 15 +++++++++++++-- polemarch/static/js/pmHosts.js | 5 ++++- polemarch/static/js/pmInventories.js | 8 ++++++-- polemarch/static/js/pmModuleTemplates.js | 4 +++- polemarch/static/js/pmPeriodicTasks.js | 4 +++- polemarch/static/js/pmProjects.js | 17 +++++++++++------ polemarch/static/js/pmTasksTemplates.js | 6 ++++-- polemarch/static/js/pmTemplates.js | 21 --------------------- polemarch/static/js/pmUsers.js | 20 +++++++++++++++----- 10 files changed, 72 insertions(+), 42 deletions(-) diff --git a/polemarch/static/js/filedsLib.js b/polemarch/static/js/filedsLib.js index 0778a26d..b24d6108 100644 --- a/polemarch/static/js/filedsLib.js +++ b/polemarch/static/js/filedsLib.js @@ -1,5 +1,6 @@ var filedsLib = {} +filedsLib.validator = {} filedsLib.returnString = function(str){ return function(){ @@ -24,7 +25,6 @@ filedsLib.getFunctionValue = function(obj) */ filedsLib.filed = function(){} - /** * Для вывода текстового поля * @type Object @@ -67,4 +67,16 @@ filedsLib.filed.boolean.type = 'boolean' filedsLib.filed.boolean.getValue = function(pmObj, filed){ return $("#filed_"+filed.name).hasClass('selected'); +} + + +filedsLib.validator.notEmpty = function(value, name) +{ + if(value != '' && value) + { + return true; + } + + $.notify("Invalid value in field `"+name+"` it mast be not empty", "error"); + return false; } \ No newline at end of file diff --git a/polemarch/static/js/pmGroups.js b/polemarch/static/js/pmGroups.js index 66eb8a4c..836c06db 100644 --- a/polemarch/static/js/pmGroups.js +++ b/polemarch/static/js/pmGroups.js @@ -119,6 +119,7 @@ pmGroups.validator = function(value) $.notify("Invalid value in field name it mast be as [^A-z0-9_.\-]", "error"); return false; } + pmGroups.fast_validator = function(value) { return /[^A-z0-9_.\-]/.test(value) @@ -620,9 +621,19 @@ pmGroups.groupsAutocompleteTemplate = function(inventory_id, value, prefix) { //console.log('onSelect', term, item); var value = $(item).attr('data-value'); - $("#groups_autocomplete_filed"+prefix).val(value); + $("#groups_autocomplete_filed"+prefix).val(value); + $("#groups_autocomplete_filed"+prefix).attr({'data-hide':'hide'}); + }, - source: function(original_term, response){ + source: function(original_term, response) + { + var isHide = $("#groups_autocomplete_filed"+prefix).attr('data-hide') + if(isHide == "hide") + { + $("#groups_autocomplete_filed"+prefix).attr({'data-hide':'show'}) + return; + } + pmGroups.groupsAutocompleteMatcher(original_term, response, inventory_id) } }); diff --git a/polemarch/static/js/pmHosts.js b/polemarch/static/js/pmHosts.js index 0398bbfe..5ea1bd8d 100644 --- a/polemarch/static/js/pmHosts.js +++ b/polemarch/static/js/pmHosts.js @@ -47,7 +47,10 @@ pmHosts.fileds = [ name:'name', placeholder:'Enter host or range name', help:'Host or range name', - validator:function(value){ return this.validateRangeName(value) || this.validateHostName(value)}, + validator:function(value) + { + return filedsLib.validator.notEmpty('name', value) + }, fast_validator:function(value){ return this.validateRangeName(value) || this.validateHostName(value)} }, ] diff --git a/polemarch/static/js/pmInventories.js b/polemarch/static/js/pmInventories.js index 22e51c61..81609064 100644 --- a/polemarch/static/js/pmInventories.js +++ b/polemarch/static/js/pmInventories.js @@ -926,7 +926,9 @@ pmInventories.model.page_new = { title:'Name', name:'name', placeholder:'Enter inventory name', - validator:function(value){ return value != '' && value}, + validator:function(value){ + return filedsLib.validator.notEmpty(value, 'Name') + }, fast_validator:function(value){ return value != '' && value} }, ] @@ -1016,7 +1018,9 @@ pmInventories.model.page_item = { title:'Name', name:'name', placeholder:'Enter inventory name', - validator:function(value){ return value != '' && value}, + validator:function(value){ + return filedsLib.validator.notEmpty(value, 'Name') + }, fast_validator:function(value){ return value != '' && value} }, ] diff --git a/polemarch/static/js/pmModuleTemplates.js b/polemarch/static/js/pmModuleTemplates.js index 9a5efc54..380cd334 100644 --- a/polemarch/static/js/pmModuleTemplates.js +++ b/polemarch/static/js/pmModuleTemplates.js @@ -115,7 +115,9 @@ pmModuleTemplates.model.page_item = { title:'Name', name:'name', placeholder:'Enter template name', - validator:function(value){ return value != '' && value}, + validator:function(value){ + return filedsLib.validator.notEmpty(value, 'Name') + }, fast_validator:function(value){ return value != '' && value} }, ],[ diff --git a/polemarch/static/js/pmPeriodicTasks.js b/polemarch/static/js/pmPeriodicTasks.js index 69d67fa2..94fde71a 100644 --- a/polemarch/static/js/pmPeriodicTasks.js +++ b/polemarch/static/js/pmPeriodicTasks.js @@ -407,7 +407,9 @@ pmPeriodicTasks.model.page_item = { title:'Name', name:'name', placeholder:'Enter template name', - validator:function(value){ return value != '' && value}, + validator:function(value){ + return filedsLib.validator.notEmpty(value, 'Name') + }, fast_validator:function(value){ return value != '' && value} }, { diff --git a/polemarch/static/js/pmProjects.js b/polemarch/static/js/pmProjects.js index 653a0252..476133d0 100644 --- a/polemarch/static/js/pmProjects.js +++ b/polemarch/static/js/pmProjects.js @@ -116,7 +116,9 @@ pmProjects.model.page_new = { name:'name', placeholder:'Project name', help:'', - validator:function(value){ return value != '' && value}, + validator:function(value){ + return filedsLib.validator.notEmpty(value, 'Name') + }, fast_validator:function(value){ return value != '' && value} }, { @@ -230,7 +232,9 @@ pmProjects.model.page_item = { title:'Name', name:'name', placeholder:'Enter project name', - validator:function(value){ return value != '' && value}, + validator:function(value){ + return filedsLib.validator.notEmpty(value, 'Name') + }, fast_validator:function(value){ return value != '' && value} }, { @@ -317,7 +321,7 @@ pmProjects.openRunPlaybookPage = function(holder, menuInfo, data) var def = new $.Deferred(); var thisObj = this; var project_id = data.reg[1] - $.when(pmTasks.searchItems(project_id, "project"), pmProjects.loadItem(project_id), pmInventories.loadAllItems()).done(function() + $.when(pmTasks.searchItems(project_id, "project"), pmProjects.loadItem(project_id), pmInventories.loadAllItems()).done(function(results) { $(holder).insertTpl(spajs.just.render(thisObj.model.name+'_run_playbook', {item_id:project_id, query:project_id})) @@ -344,14 +348,15 @@ pmProjects.openRunPlaybookPage = function(holder, menuInfo, data) term = term.toLowerCase(); var matches = [] - for(var i in pmTasks.model.items) + for(var i in results[0].results) { - var val = pmTasks.model.items[i] - if(val.name.toLowerCase().indexOf(term) != -1 && val.project == project_id) + var val = pmTasks.model.itemslist.results[i] + if(val.name.toLowerCase().indexOf(term) != -1 && val.project == project_id && val.name.toLowerCase() != term) { matches.push(val) } } + if(matches.length) { response(matches); diff --git a/polemarch/static/js/pmTasksTemplates.js b/polemarch/static/js/pmTasksTemplates.js index 8a8c696e..ba4b0509 100644 --- a/polemarch/static/js/pmTasksTemplates.js +++ b/polemarch/static/js/pmTasksTemplates.js @@ -72,7 +72,7 @@ pmTasksTemplates.filed.selectProjectInventoryAndPlaybook.render = function(pmObj }) } - + // Export all selected templates pmTasksTemplates.model.page_list = { buttons:[ @@ -173,7 +173,9 @@ pmTasksTemplates.model.page_item = { title:'Name', name:'name', placeholder:'Enter template name', - validator:function(value){ return value != '' && value}, + validator:function(value){ + return filedsLib.validator.notEmpty(value, 'Name') + }, fast_validator:function(value){ return value != '' && value} }, // @todo дорефакторить поля ввода diff --git a/polemarch/static/js/pmTemplates.js b/polemarch/static/js/pmTemplates.js index 7b3008b4..91cdd8b4 100644 --- a/polemarch/static/js/pmTemplates.js +++ b/polemarch/static/js/pmTemplates.js @@ -39,27 +39,6 @@ pmTemplates.copyAndEdit = function(item_id) // Содержит соответсвия разных kind к объектами с ними работающими. pmTemplates.model.kindObjects = {} -pmTemplates.showSearchResults = function(holder, menuInfo, data) -{ - var thisObj = this; - var query = decodeURIComponent(data.reg[1]) - - var search = this.searchStringToObject(query) - search['kind'] = thisObj.model.kind - return $.when(this.sendSearchQuery(search)).done(function() - { - var tpl = thisObj.model.name+'_list' - if(!spajs.just.isTplExists(tpl)) - { - tpl = 'items_list' - } - - $(holder).insertTpl(spajs.just.render(tpl, {query:query, pmObj:thisObj, opt:{}})) - }).fail(function() - { - $.notify("", "error"); - }) -} pmTemplates.exportToFile = function(item_ids) { diff --git a/polemarch/static/js/pmUsers.js b/polemarch/static/js/pmUsers.js index 3aae34e6..c2d1eaec 100644 --- a/polemarch/static/js/pmUsers.js +++ b/polemarch/static/js/pmUsers.js @@ -40,7 +40,9 @@ pmUsers.fileds = [ name:'username', placeholder:'Enter user name', help:'', - validator:function(value){ return value != '' && value}, + validator:function(value){ + return filedsLib.validator.notEmpty(value, 'Name') + }, fast_validator:function(value){ return value != '' && value} }, { @@ -49,7 +51,9 @@ pmUsers.fileds = [ name:'password', placeholder:'Enter user password', help:'', - validator:function(value){ return value != '' && value}, + validator:function(value){ + return filedsLib.validator.notEmpty(value, 'Password') + }, fast_validator:function(value){ return value != '' && value} }, ],[ @@ -59,7 +63,9 @@ pmUsers.fileds = [ name:'email', placeholder:'Enter user email', help:'', - validator:function(value){ return value != '' && value}, + validator:function(value){ + return filedsLib.validator.notEmpty(value, 'Email') + }, fast_validator:function(value){ return value != '' && value} }, { @@ -68,7 +74,9 @@ pmUsers.fileds = [ name:'first_name', placeholder:'Enter user first name', help:'', - validator:function(value){ return value != '' && value}, + validator:function(value){ + return filedsLib.validator.notEmpty(value, 'First name') + }, fast_validator:function(value){ return value != '' && value} }, ],[ @@ -78,7 +86,9 @@ pmUsers.fileds = [ name:'last_name', placeholder:'Enter user last name', help:'', - validator:function(value){ return value != '' && value}, + validator:function(value){ + return filedsLib.validator.notEmpty(value, 'Last name') + }, fast_validator:function(value){ return value != '' && value} }, { From 26d0f0dd02464fc86cc02d8d92e3264543fcb939 Mon Sep 17 00:00:00 2001 From: Trapenok Victor Date: Thu, 30 Nov 2017 14:08:43 +1000 Subject: [PATCH 103/110] fix bugs before release --- polemarch/static/js/pmTasksTemplates.js | 9 +++++++++ polemarch/static/templates/pmItems.html | 16 ++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/polemarch/static/js/pmTasksTemplates.js b/polemarch/static/js/pmTasksTemplates.js index ba4b0509..ee34059e 100644 --- a/polemarch/static/js/pmTasksTemplates.js +++ b/polemarch/static/js/pmTasksTemplates.js @@ -89,6 +89,15 @@ pmTasksTemplates.model.page_list = { link:function(){ return '/?template/new-module'}, }, ], + actionsOnSelected:[ + {}, + { + class:'btn btn-primary', + function:function(){ return "pmTasksTemplates.exportSelecedToFile(); return false;"}, + title:'Export all selected templates', + link:function(){ return '#'}, + }, + ], title: "Templates", short_title: "Templates", fileds:[ diff --git a/polemarch/static/templates/pmItems.html b/polemarch/static/templates/pmItems.html index 54828145..bd7d097e 100644 --- a/polemarch/static/templates/pmItems.html +++ b/polemarch/static/templates/pmItems.html @@ -185,6 +185,22 @@

      • Delete all selected elements
        • + <% for(var j in pmObj.model.page_list.actionsOnSelected){ %> + <% if(!pmObj.model.page_list.actionsOnSelected[j].title){ %> + + <% }else{ %> +
      • + + <% if(typeof pmObj.model.page_list.actionsOnSelected[j].title == 'function'){ %> + <%= pmObj.model.page_list.actionsOnSelected[j].title.apply(pmObj, [pmObj.model.itemslist.results[i], opt]) %> + <% }else{ %> + <%- pmObj.model.page_list.actionsOnSelected[j].title %> + <% } %> + +
        • + <% } %> + <% } %>

    From 764a4f20f81d0bacf5980d9315884022c9a31d41 Mon Sep 17 00:00:00 2001 From: Trapenok Victor Date: Thu, 30 Nov 2017 14:11:53 +1000 Subject: [PATCH 104/110] fix bugs before release --- polemarch/static/templates/pmHistory.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polemarch/static/templates/pmHistory.html b/polemarch/static/templates/pmHistory.html index d813a781..546403d7 100644 --- a/polemarch/static/templates/pmHistory.html +++ b/polemarch/static/templates/pmHistory.html @@ -50,7 +50,7 @@

    <%- val.id + " - " + val.mode %> + onclick="return spajs.openURL(this.href);" ><%- val.mode %> <% if(pmProjects.model.items[val.project]){ %> From a755ff2325da8579ae1613b159e54e0cd6f2751c Mon Sep 17 00:00:00 2001 From: Trapenok Victor Date: Thu, 30 Nov 2017 17:47:13 +1000 Subject: [PATCH 105/110] fix bugs before release --- polemarch/static/templates/pmPeriodicTasks.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/polemarch/static/templates/pmPeriodicTasks.html b/polemarch/static/templates/pmPeriodicTasks.html index 013b1609..1bf13c7c 100644 --- a/polemarch/static/templates/pmPeriodicTasks.html +++ b/polemarch/static/templates/pmPeriodicTasks.html @@ -396,14 +396,14 @@

    sec

    • - - -
    - - <%= crontabEditor.editor({string:''}) %> -
    + +
    + + <%= crontabEditor.editor({string:''}) %> +
    +
    From 2f61c90d9c3f1da6793216ee53dc2492f6767374 Mon Sep 17 00:00:00 2001 From: cepreu Date: Thu, 30 Nov 2017 17:54:58 +1000 Subject: [PATCH 106/110] fixed issues with run with inventories files from project (issue #36) --- .../static/templates/pmPeriodicTasks.html | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/polemarch/static/templates/pmPeriodicTasks.html b/polemarch/static/templates/pmPeriodicTasks.html index 1bf13c7c..b6f08ab2 100644 --- a/polemarch/static/templates/pmPeriodicTasks.html +++ b/polemarch/static/templates/pmPeriodicTasks.html @@ -234,15 +234,16 @@

    -
    - - <% if(pmPeriodicTasks.model.items[item_id].type == 'CRONTAB'){ %> - <%= crontabEditor.editor({string:pmPeriodicTasks.model.items[item_id].schedule}) %> - <% }else{ %> - <%= crontabEditor.editor({string:''}) %> - <% } %> -
    -
    +
    + + <% if(pmPeriodicTasks.model.items[item_id].type == 'CRONTAB'){ %> + <%= crontabEditor.editor({string:pmPeriodicTasks.model.items[item_id].schedule}) %> + <% }else{ %> + <%= crontabEditor.editor({string:''}) %> + <% } %> +
    +
    + <% }else{ %> <% } %> From 0ca18b7d5284a107befb2f395018afed3fe11a97 Mon Sep 17 00:00:00 2001 From: Trapenok Victor Date: Thu, 30 Nov 2017 18:05:15 +1000 Subject: [PATCH 107/110] fix bugs before release --- polemarch/static/templates/pmHistory.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/polemarch/static/templates/pmHistory.html b/polemarch/static/templates/pmHistory.html index 546403d7..be444b53 100644 --- a/polemarch/static/templates/pmHistory.html +++ b/polemarch/static/templates/pmHistory.html @@ -73,7 +73,7 @@

    <%= pmPeriodicTasks.model.items[val.initiator].justText('name') %> <% }else{ %> - <%- pmHistory.model.items[item_id].initiator_type %> + <%- val.initiator_type %> <% } %> @@ -202,7 +202,7 @@

    <%= pmPeriodicTasks.model.items[val.initiator].justText('name') %> <% }else{ %> - <%- pmHistory.model.items[item_id].initiator_type %> + <%- val.initiator_type %> <% } %> @@ -335,7 +335,7 @@

    <%= pmPeriodicTasks.model.items[val.initiator].justText('name') %> <% }else{ %> - <%- pmHistory.model.items[item_id].initiator_type %> + <%- val.initiator_type %> <% } %> From cf07cc3dcb89607107f8d45816242f9dadcf5594 Mon Sep 17 00:00:00 2001 From: Trapenok Victor Date: Fri, 1 Dec 2017 13:45:40 +1000 Subject: [PATCH 108/110] fix bugs before release --- polemarch/static/js/pmItems.js | 4 +- polemarch/static/js/pmUsers.js | 88 ++++++++++++++++++++++++++-------- 2 files changed, 69 insertions(+), 23 deletions(-) diff --git a/polemarch/static/js/pmItems.js b/polemarch/static/js/pmItems.js index 076fa99e..deb4e742 100644 --- a/polemarch/static/js/pmItems.js +++ b/polemarch/static/js/pmItems.js @@ -836,7 +836,7 @@ pmItems.addItem = function(parent_type, parent_item, opt) if(this.model.page_new.onBeforeSave) { data = this.model.page_new.onBeforeSave.apply(this, [data, opt]); - if(data === undefined) + if(data == undefined || data == false) { def.reject() return def.promise(); @@ -899,7 +899,7 @@ pmItems.updateItem = function(item_id, opt) if(this.model.page_item.onBeforeSave) { data = this.model.page_item.onBeforeSave.apply(this, [data, item_id, opt]); - if(data === undefined) + if(data == undefined || data == false) { def.reject() return def.promise(); diff --git a/polemarch/static/js/pmUsers.js b/polemarch/static/js/pmUsers.js index c2d1eaec..3b60f42b 100644 --- a/polemarch/static/js/pmUsers.js +++ b/polemarch/static/js/pmUsers.js @@ -32,7 +32,12 @@ pmUsers.model.page_list = { ] } -pmUsers.fileds = [ +// pmUsers.fileds = + +pmUsers.model.page_new = { + title: "New user", + short_title: "New user", + fileds:[ [ { filed: new filedsLib.filed.text(), @@ -63,10 +68,6 @@ pmUsers.fileds = [ name:'email', placeholder:'Enter user email', help:'', - validator:function(value){ - return filedsLib.validator.notEmpty(value, 'Email') - }, - fast_validator:function(value){ return value != '' && value} }, { filed: new filedsLib.filed.text(), @@ -74,10 +75,6 @@ pmUsers.fileds = [ name:'first_name', placeholder:'Enter user first name', help:'', - validator:function(value){ - return filedsLib.validator.notEmpty(value, 'First name') - }, - fast_validator:function(value){ return value != '' && value} }, ],[ { @@ -86,10 +83,6 @@ pmUsers.fileds = [ name:'last_name', placeholder:'Enter user last name', help:'', - validator:function(value){ - return filedsLib.validator.notEmpty(value, 'Last name') - }, - fast_validator:function(value){ return value != '' && value} }, { filed: new filedsLib.filed.boolean(), @@ -97,12 +90,7 @@ pmUsers.fileds = [ name:'is_active', } ] - ] - -pmUsers.model.page_new = { - title: "New user", - short_title: "New user", - fileds:pmUsers.fileds, + ], onCreate:function(result) { var def = new $.Deferred(); @@ -143,11 +131,69 @@ pmUsers.model.page_item = { short_title: function(item_id){ return "User "+pmUsers.model.items[item_id].justText('username', function(v){return v.slice(0, 20)}) }, - fileds:pmUsers.fileds, + fileds:[ + [ + { + filed: new filedsLib.filed.text(), + title:'User name', + name:'username', + placeholder:'Enter user name', + help:'', + validator:function(value){ + return filedsLib.validator.notEmpty(value, 'Name') + }, + fast_validator:function(value){ return value != '' && value} + }, + { + filed: new filedsLib.filed.password(), + title:'Password', + name:'password', + placeholder:'Enter user password', + help:'', + }, + ],[ + { + filed: new filedsLib.filed.text(), + title:'Email', + name:'email', + placeholder:'Enter user email', + help:'', + }, + { + filed: new filedsLib.filed.text(), + title:'First name', + name:'first_name', + placeholder:'Enter user first name', + help:'', + }, + ],[ + { + filed: new filedsLib.filed.text(), + title:'Last name', + name:'last_name', + placeholder:'Enter user last name', + help:'', + }, + { + filed: new filedsLib.filed.boolean(), + title:'Is active', + name:'is_active', + } + ] + ], onUpdate:function(result) { return true; - } + }, + onBeforeSave:function(data, item_id) + { + if(!data.password) + { + delete data.password + } + + return data; + }, } From 38130b7fb01704b27a0bcd7431187770c5f23d95 Mon Sep 17 00:00:00 2001 From: Trapenok Victor Date: Fri, 1 Dec 2017 13:51:03 +1000 Subject: [PATCH 109/110] fix bugs before release --- polemarch/static/templates/pmHistory.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/polemarch/static/templates/pmHistory.html b/polemarch/static/templates/pmHistory.html index be444b53..cdf2c56d 100644 --- a/polemarch/static/templates/pmHistory.html +++ b/polemarch/static/templates/pmHistory.html @@ -73,7 +73,7 @@

    <%= pmPeriodicTasks.model.items[val.initiator].justText('name') %> <% }else{ %> - <%- val.initiator_type %> + scheduler <% } %> @@ -202,7 +202,7 @@

    <%= pmPeriodicTasks.model.items[val.initiator].justText('name') %> <% }else{ %> - <%- val.initiator_type %> + scheduler <% } %> @@ -335,7 +335,7 @@

    <%= pmPeriodicTasks.model.items[val.initiator].justText('name') %> <% }else{ %> - <%- val.initiator_type %> + scheduler <% } %> @@ -480,7 +480,7 @@

    <%= pmPeriodicTasks.model.items[pmHistory.model.items[item_id].initiator].justText('name') %> <% }else{ %> - From <%- pmHistory.model.items[item_id].initiator_type %> + From scheduler <% } %>
    @@ -633,7 +633,7 @@

    <%= pmPeriodicTasks.model.items[pmHistory.model.items[item_id].initiator].justText('name') %> <% }else{ %> - From <%- pmHistory.model.items[item_id].initiator_type %> + From scheduler <% } %>
    From b1fffc33d2c705ca853d3da1cfda85137894bce1 Mon Sep 17 00:00:00 2001 From: cepreu Date: Fri, 1 Dec 2017 15:30:35 +1000 Subject: [PATCH 110/110] fixed task canceling with files from project (issue cloud/polemarchplus#52) --- polemarch/main/models/tasks.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/polemarch/main/models/tasks.py b/polemarch/main/models/tasks.py index f390db03..2b6b33fb 100644 --- a/polemarch/main/models/tasks.py +++ b/polemarch/main/models/tasks.py @@ -370,6 +370,8 @@ def write_line(self, value, number): # nocv ) def editable_by(self, user): + if self.inventory is None: + return self.project.editable_by(user) return self.inventory.editable_by(user) def viewable_by(self, user):