mirror of
https://github.com/ansible/awx.git
synced 2026-02-21 21:20:08 -03:30
Add model and resolve block to sandbox view
This commit is contained in:
committed by
Jake McDermott
parent
212ab96a31
commit
5b8d2e7659
@@ -26,7 +26,13 @@ const watch = {
|
|||||||
test: /\.js$/,
|
test: /\.js$/,
|
||||||
enforce: 'pre',
|
enforce: 'pre',
|
||||||
exclude: /node_modules/,
|
exclude: /node_modules/,
|
||||||
loader: 'eslint-loader'
|
loader: 'eslint-loader',
|
||||||
|
options: {
|
||||||
|
failOnWarning: false,
|
||||||
|
failOnError: false,
|
||||||
|
emitError: false,
|
||||||
|
emitWarning: false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
function JobsIndexController () {
|
function JobsIndexController (resolved) {
|
||||||
|
console.log('test', resolved);
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = JobsIndexController;
|
module.exports = JobsIndexController;
|
||||||
|
|||||||
@@ -17,9 +17,20 @@ function JobsRun ($stateExtender, strings) {
|
|||||||
activityStreamTarget: 'jobs'
|
activityStreamTarget: 'jobs'
|
||||||
},
|
},
|
||||||
views: {
|
views: {
|
||||||
templateUrl: indexTemplate,
|
'@': {
|
||||||
controller: IndexController,
|
templateUrl: indexTemplate,
|
||||||
controllerAs: 'vm'
|
controller: IndexController,
|
||||||
|
controllerAs: 'vm'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
resolve: {
|
||||||
|
resolved: ['JobsModel', Jobs => {
|
||||||
|
const jobs = new Jobs();
|
||||||
|
|
||||||
|
return {
|
||||||
|
models: { jobs }
|
||||||
|
};
|
||||||
|
}]
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,12 @@
|
|||||||
<p>
|
<div class="container-fluid">
|
||||||
test
|
<div class="col-md-4">
|
||||||
</p>
|
<at-panel>
|
||||||
|
<p>left</p>
|
||||||
|
</at-panel>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-8">
|
||||||
|
<at-panel>
|
||||||
|
<p>right</p>
|
||||||
|
</at-panel>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import InventoryScript from '~models/InventoryScript';
|
|||||||
import InventorySource from '~models/InventorySource';
|
import InventorySource from '~models/InventorySource';
|
||||||
import Job from '~models/Job';
|
import Job from '~models/Job';
|
||||||
import JobTemplate from '~models/JobTemplate';
|
import JobTemplate from '~models/JobTemplate';
|
||||||
|
import Jobs from '~models/Jobs';
|
||||||
import Me from '~models/Me';
|
import Me from '~models/Me';
|
||||||
import ModelsStrings from '~models/models.strings';
|
import ModelsStrings from '~models/models.strings';
|
||||||
import NotificationTemplate from '~models/NotificationTemplate';
|
import NotificationTemplate from '~models/NotificationTemplate';
|
||||||
@@ -44,6 +45,7 @@ angular
|
|||||||
.service('InventorySourceModel', InventorySource)
|
.service('InventorySourceModel', InventorySource)
|
||||||
.service('JobModel', Job)
|
.service('JobModel', Job)
|
||||||
.service('JobTemplateModel', JobTemplate)
|
.service('JobTemplateModel', JobTemplate)
|
||||||
|
.service('JobsModel', Jobs)
|
||||||
.service('MeModel', Me)
|
.service('MeModel', Me)
|
||||||
.service('ModelsStrings', ModelsStrings)
|
.service('ModelsStrings', ModelsStrings)
|
||||||
.service('NotificationTemplate', NotificationTemplate)
|
.service('NotificationTemplate', NotificationTemplate)
|
||||||
|
|||||||
Reference in New Issue
Block a user