verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

8144-devToTest_2448 #3216

Merged
alexm merged 256 commits from 8144-devToTest_2448 into test 2024-11-19 07:36:04 +00:00
Conversation 0 Commits 256 Files Changed 376 +21 -15
4 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2f5f4ecc7c - Show all commits

3
db/routines/salix/triggers/ACL_beforeInsert.sql
View File

@ -4,5 +4,8 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `salix`.`ACL_beforeInsert`
FOR EACH ROW FOR EACH ROW
BEGIN BEGIN
SET NEW.editorFk = account.myUser_getId(); SET NEW.editorFk = account.myUser_getId();
IF NEW.`property` = '*' THEN
CALL util.throw('The property field cannot be *');
END IF;
END$$ END$$
DELIMITER ; DELIMITER ;

3
db/versions/11314-redTulip/00-restrictedAsterisk.sql Normal file
View File

@ -0,0 +1,3 @@
DELETE FROM `salix`.`ACL`
WHERE `model` = 'Worker'
AND `property` IN ('find', 'findById', 'findOne');

16
modules/item/front/item-type/basic-data/index.html
View File

@ -11,26 +11,26 @@
<vn-card class="vn-pa-lg"> <vn-card class="vn-pa-lg">
<vn-vertical> <vn-vertical>
<vn-textfield <vn-textfield
label="Code" label="Code"
ng-model="$ctrl.itemType.code" ng-model="$ctrl.itemType.code"
rule rule
vn-focus> vn-focus>
</vn-textfield> </vn-textfield>
<vn-textfield <vn-textfield
label="Name" label="Name"
ng-model="$ctrl.itemType.name" ng-model="$ctrl.itemType.name"
rule> rule>
</vn-textfield> </vn-textfield>
<vn-autocomplete <vn-autocomplete
label="Worker" label="Worker"
ng-model="$ctrl.itemType.workerFk" ng-model="$ctrl.itemType.workerFk"
url="Workers" url="Workers/search"
show-field="firstName" show-field="nickname"
value-field="id" value-field="id"
rule> rule>
</vn-autocomplete> </vn-autocomplete>
<vn-autocomplete <vn-autocomplete
label="Category" label="Category"
ng-model="$ctrl.itemType.categoryFk" ng-model="$ctrl.itemType.categoryFk"
url="ItemCategories" url="ItemCategories"
show-field="name" show-field="name"
@ -38,7 +38,7 @@
rule> rule>
</vn-autocomplete> </vn-autocomplete>
<vn-autocomplete <vn-autocomplete
label="Temperature" label="Temperature"
ng-model="$ctrl.itemType.temperatureFk" ng-model="$ctrl.itemType.temperatureFk"
url="Temperatures" url="Temperatures"
show-field="name" show-field="name"
@ -59,4 +59,4 @@
ng-click="watcher.loadOriginalData()"> ng-click="watcher.loadOriginalData()">
</vn-button> </vn-button>
</vn-button-bar> </vn-button-bar>
</form> </form>

14
modules/item/front/item-type/create/index.html
View File

@ -12,26 +12,26 @@
<vn-card class="vn-pa-lg"> <vn-card class="vn-pa-lg">
<vn-vertical> <vn-vertical>
<vn-textfield <vn-textfield
label="Code" label="Code"
ng-model="$ctrl.itemType.code" ng-model="$ctrl.itemType.code"
rule rule
vn-focus> vn-focus>
</vn-textfield> </vn-textfield>
<vn-textfield <vn-textfield
label="Name" label="Name"
ng-model="$ctrl.itemType.name" ng-model="$ctrl.itemType.name"
rule> rule>
</vn-textfield> </vn-textfield>
<vn-autocomplete <vn-autocomplete
label="Worker" label="Worker"
ng-model="$ctrl.itemType.workerFk" ng-model="$ctrl.itemType.workerFk"
url="Workers" url="Workers/search"
show-field="firstName" show-field="nickname"
value-field="id" value-field="id"
rule> rule>
</vn-autocomplete> </vn-autocomplete>
<vn-autocomplete <vn-autocomplete
label="Category" label="Category"
ng-model="$ctrl.itemType.categoryFk" ng-model="$ctrl.itemType.categoryFk"
url="ItemCategories" url="ItemCategories"
show-field="name" show-field="name"
@ -39,7 +39,7 @@
rule> rule>
</vn-autocomplete> </vn-autocomplete>
<vn-autocomplete <vn-autocomplete
label="Temperature" label="Temperature"
ng-model="$ctrl.itemType.temperatureFk" ng-model="$ctrl.itemType.temperatureFk"
url="Temperatures" url="Temperatures"
show-field="name" show-field="name"