Merge remote-tracking branch 'upstream/master'

merge-requests/1/head
charithag 9 years ago
commit 70dd0203b5

@ -409,6 +409,10 @@
<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/statistics" /> <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/statistics" />
<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/patches" />
<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/dropins" />
<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps" overwrite="true"> <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps" overwrite="true">
<fileset dir="src/repository/jaggeryapps"></fileset> <fileset dir="src/repository/jaggeryapps"></fileset>
</copy> </copy>
@ -424,6 +428,15 @@
<copy todir="target/wso2carbon-core-${carbon.kernel.version}/statistics" overwrite="true"> <copy todir="target/wso2carbon-core-${carbon.kernel.version}/statistics" overwrite="true">
<fileset dir="src/statistics" /> <fileset dir="src/statistics" />
</copy> </copy>
<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/patches">
<fileset dir="src/patches" />
</copy>
<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/dropins">
<fileset dir="src/dropins" />
</copy>
<!--<copy todir="target/wso2carbon-core-${carbon.kernel.version}/modules" overwrite="true"> <!--<copy todir="target/wso2carbon-core-${carbon.kernel.version}/modules" overwrite="true">
<fileset dir="src/repository/modules"></fileset> <fileset dir="src/repository/modules"></fileset>
</copy> </copy>

@ -237,7 +237,5 @@
</div> </div>
{{/zone}} {{/zone}}
{{#zone "bottomJs"}} {{#zone "bottomJs"}}
<script id="hidden-operations-bar-ios" src="{{self.publicURL}}/templates/hidden-operations-ios.hbs" type="text/x-handlebars-template" ></script>
<script id="hidden-operations-bar-android" src="{{self.publicURL}}/templates/hidden-operations-android.hbs" type="text/x-handlebars-template" ></script>
<script src="{{self.publicURL}}/js/policy-create.js"></script> <script src="{{self.publicURL}}/js/policy-create.js"></script>
{{/zone}} {{/zone}}

@ -78,16 +78,15 @@ function savePolicy(){
}else if (policy.selectedUserRoles){ }else if (policy.selectedUserRoles){
payload.roles = policy.selectedUserRoles; payload.roles = policy.selectedUserRoles;
} }
invokerUtil.post("/mdm-admin/policies", payload, function(){ //invokerUtil.post("/mdm-admin/policies", payload, function(){
$(".policy-message").removeClass("hidden"); // $(".policy-message").removeClass("hidden");
$(".add-policy").addClass("hidden"); // $(".add-policy").addClass("hidden");
}, function(){ //}, function(){
//
}); //});
} }
$(document).ready(function(){ $(document).ready(function(){
alert("hiiiii");
initStepper(".wizard-stepper"); initStepper(".wizard-stepper");
$( "input[type='radio'].user-select-radio" ).change(function() { $( "input[type='radio'].user-select-radio" ).change(function() {
$('.user-select').hide(); $('.user-select').hide();

File diff suppressed because one or more lines are too long

@ -0,0 +1,6 @@
{{#zone "topLibCss"}}
<link rel="stylesheet" href="{{self.publicURL}}/css/select2.min.css">
{{/zone}}
{{#zone "bottomJs"}}
<script src="{{self.publicURL}}/js/select2.full.min.js"></script>
{{/zone}}
Loading…
Cancel
Save