Skip to content

MOTECH-2731: Migrate Module Settings#42

Merged
jredlarski merged 7 commits into
motech:masterfrom
matkwiatkowski:motech-2731
Jul 28, 2016
Merged

MOTECH-2731: Migrate Module Settings#42
jredlarski merged 7 commits into
motech:masterfrom
matkwiatkowski:motech-2731

Conversation

@matkwiatkowski
Copy link
Copy Markdown
Contributor

  • added module settings in admin
  • added file-upload directive
  • settings for task module still won't work, because task settings page isn't implemented yet

@jredlarski jredlarski self-assigned this Jul 27, 2016

LoadingModal.open();

$(id).ajaxSubmit({
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As suggested in PR#39 we should not use JQueryFormPlugin as it is rather unsupported.

@jredlarski
Copy link
Copy Markdown
Collaborator

@mkwiatkowskisoldevelo Here are some issues that I have found in your PR:

(1) We shouldn't use JQueryFormPlugin so lets drop that.
(2) Please add translate to the translatable stings and refactor html a bit. I've made some inline comments for that.
(3) You have added an empty 'file-upload.css' file and 'file-upload.en.properties' file with a variable which isn't used. I believe both should be removed, right?

@motech-gerrit
Copy link
Copy Markdown

Can one of the admins verify this patch?

Comment thread src/admin/bundles/bundle-settings.html Outdated
<form id="_raw_{{rawFile}}" name="{{rawFile}}Form">
<div class="form-group fileinput fileinput-new" data-provides="fileinput">
<label>{{msg('admin.button.selectFile')}}</label>
<div class="col-sm-9 col-md-10">
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try not to use the col- classes

@jredlarski
Copy link
Copy Markdown
Collaborator

@mkwiatkowskisoldevelo I've added a motech-file-upload directive in a separate PR so please use it and resolve any conflicts if they occur.

Comment thread src/admin/nav.html Outdated
<li ui-sref-active="active"><a ui-sref="bundles">{{ 'admin.manageModules' | translate }}</a></li>
<li><a>{{ 'admin.messages' | translate }}</a></li>
<li><a>{{ 'admin.settings' | translate }}</a></li>
<li ui-sref-active="active"><a ui-sref="platformSettings">{{ 'admin.settings' | translate }}</a></li>
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mkwiatkowskisoldevelo Why did you add navigation to the settings page?

function controller($scope, $stateParams, $http, BundleSettingsFactory, BundleRawSettingsFactory, LoadingModal, ModalFactory, BundlesFactory){

var restartBundleHandler = function () {
$scope.module.$restart();
Copy link
Copy Markdown
Collaborator

@jredlarski jredlarski Jul 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't it be $scope.module.restart();? Additionally, please check if modal appears after a successful restart.

@jredlarski jredlarski merged commit 2d78758 into motech:master Jul 28, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants