Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

マスタデーター管理で、エラーを表示するように修正 #2108

Merged
merged 9 commits into from
Feb 28, 2017

Conversation

hoand-vn
Copy link
Contributor

@hoand-vn hoand-vn commented Feb 13, 2017

ref #1884

Fixed : マスタデーター管理の必須チェックエラーが表示されない

@ryo-endo ryo-endo changed the title Bug fix #1884 マスタデーター管理で、エラーを表示するように修正 Feb 15, 2017
@ryo-endo ryo-endo added this to the 3.0.14 milestone Feb 15, 2017
Copy link
Contributor

@ryo-endo ryo-endo left a comment

Choose a reason for hiding this comment

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

コード確認しました。問題ないと思います。

@@ -3223,3 +3223,7 @@ textarea#log {
#shipping_info__button_new {
margin-bottom: 20px;
}

Copy link
Contributor

Choose a reason for hiding this comment

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

please delete this source code.

@@ -89,10 +93,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
{% for data in form2.data %}
<tr id="result_list__item--{{ data.vars.name }}">
<td id="result_list__id--{{ data.vars.name }}">
{{form_widget(data.id)}}
{{form_widget(data.id)}} <br/>
Copy link
Contributor

Choose a reason for hiding this comment

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

please delete <br/> .

</td>
<td id="result_list__name--{{ data.vars.name }}">
{{form_widget(data.name)}}
{{form_widget(data.name)}} <br/>
Copy link
Contributor

Choose a reason for hiding this comment

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

please delete <br/> .

Copy link
Contributor

@t-nagahashi t-nagahashi left a comment

Choose a reason for hiding this comment

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

ソースコード問題ありません。

@t-nagahashi
Copy link
Contributor

t-nagahashi commented Feb 28, 2017

動作確認も問題ありません。

ID Name result
0 0
0 値なし ×
値なし 0 ×
数値以外 文字列 ×
数値 文字列

@t-nagahashi
Copy link
Contributor

エラーメッセージが黒色のままであるが、
暫定対応でなく、恒久対応を行う予定です。
本PR取り込み後すぐに恒久対応のソースを入れる予定です。

Copy link
Contributor

@ryo-endo ryo-endo left a comment

Choose a reason for hiding this comment

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

問題ないと思います。
影響する機能が限定的なので、3.0.14に含める方向で進めます。

@ryo-endo ryo-endo merged commit a185077 into EC-CUBE:master Feb 28, 2017
ryo-endo pushed a commit to ryo-endo/ec-cube that referenced this pull request Apr 3, 2017
コミットログが多いので、まとめてコミットします。
* [FIX] Fix issue 1884
* [FIX] Fix as review.
* [FIX] Change check condition.
* [ADD] Add unit test for zero case.
* [REMOVE] Remove app translate.
* [REMOVE] Remove alert error of the master edit page.
* [MOVE] Move css into dashboard.css
* [REMOVE] Remove color for error text.
@lqdung-lockon lqdung-lockon deleted the bug_fix_#1884 branch September 26, 2017 07:21
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.

None yet

4 participants