Skip to content

Commit 357291e

Browse files
bahossphp-coder
andcommitted
Update src/main/java/ru/mystamps/web/feature/site/ResourceUrl.java
Co-authored-by: Slava Semushin <[email protected]>
1 parent a8cad8c commit 357291e

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

Diff for: src/main/frontend/src/components/AddCatalogNumbersForm.js

+6
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,15 @@ class AddCatalogNumbersForm extends React.Component {
132132
<div className="col-sm-6">
133133
<input
134134
id="catalog-numbers"
135+
<<<<<<< HEAD
135136
type="text"
136137
className="form-control js-with-tooltip"
137138
size="5"
139+
=======
140+
type="text"
141+
className="form-control"
142+
size="5"
143+
>>>>>>> Update src/main/java/ru/mystamps/web/feature/site/ResourceUrl.java
138144
required="required"
139145
onChange={ this.handleChangeNumbers } />
140146
</div>

Diff for: src/main/java/ru/mystamps/web/feature/site/ResourceUrl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public final class ResourceUrl {
5151
private static final String SIMILAR_SERIES_FORM_JS = "/public/js/" + RESOURCES_VERSION + "/components/SimilarSeriesForm.js";
5252
private static final String ADD_COMMENT_FORM_JS = "/public/js/" + RESOURCES_VERSION + "/components/AddCommentForm.js";
5353
private static final String CATALOG_PRICE_FORM_JS = "/public/js/" + RESOURCES_VERSION + "/components/AddCatalogPriceForm.js";
54-
private static final String CATALOG_NUMBERS_FORM_JS = "/public/js/" + RESOURCES_VERSION + "/components/AddCatalogNumbersForm.js";
54+
private static final String CATALOG_NUMBERS_FORM_JS = "/public/js/" + RESOURCES_VERSION + "/components/AddCatalogNumbersForm.js";
5555
private static final String RELEASE_YEAR_FORM_JS = "/public/js/" + RESOURCES_VERSION + "/components/AddReleaseYearForm.js";
5656
private static final String BOOTSTRAP_LANGUAGE = "https://cdn.jsdelivr.net/gh/usrz/bootstrap-languages@3ac2a3d2b27ac43a471cd99e79d378a03b2c6b5f/languages.min.css";
5757
private static final String FAVICON_ICO = "/favicon.ico";

Diff for: src/main/webapp/WEB-INF/views/series/info.html

+6
Original file line numberDiff line numberDiff line change
@@ -997,6 +997,12 @@ <h5 th:text="#{t_add_info_who_selling_series}">Add info about selling/buying thi
997997
'l10n': {
998998
}
999999
};
1000+
var addCatalogNumbersProps = {
1001+
'csrfHeaderName': [[ ${_csrf.headerName} ]],
1002+
'csrfTokenValue': [[ ${_csrf.token} ]],
1003+
'l10n': {
1004+
}
1005+
};
10001006
+]*/
10011007

10021008
/*[- */

0 commit comments

Comments
 (0)