Revision 58954
Added by Konstantina Galouni almost 4 years ago
Topic.java | ||
---|---|---|
14 | 14 |
private String name; |
15 | 15 |
private String alias; |
16 | 16 |
private String description; |
17 |
private String icon; |
|
17 | 18 |
private boolean isActive; |
18 | 19 |
private boolean isPublic; |
19 | 20 |
private String defaultId; |
... | ... | |
25 | 26 |
name = topic.getName(); |
26 | 27 |
alias = topic.getAlias(); |
27 | 28 |
description = topic.getDescription(); |
29 |
icon = topic.getIcon(); |
|
28 | 30 |
isActive = topic.getIsActive(); |
29 | 31 |
isPublic = topic.getIsPublic(); |
30 | 32 |
defaultId = topic.getDefaultId(); |
... | ... | |
34 | 36 |
setName(defaultTopic.getName()); |
35 | 37 |
setAlias(defaultTopic.getAlias()); |
36 | 38 |
setDescription(defaultTopic.getDescription()); |
37 |
setIsActive(false); |
|
38 |
setIsPublic(false); |
|
39 |
setIcon(defaultTopic.getIcon()); |
|
40 |
setIsActive(defaultTopic.getIsActive()); |
|
41 |
setIsPublic(defaultTopic.getIsPublic()); |
|
39 | 42 |
setDefaultId(defaultTopic.getId()); |
40 | 43 |
setCategories(new ArrayList()); |
41 | 44 |
} |
... | ... | |
72 | 75 |
this.description = description; |
73 | 76 |
} |
74 | 77 |
|
78 |
public String getIcon() { |
|
79 |
return icon; |
|
80 |
} |
|
81 |
|
|
82 |
public void setIcon(String icon) { |
|
83 |
this.icon = icon; |
|
84 |
} |
|
85 |
|
|
75 | 86 |
public boolean getIsActive() { |
76 | 87 |
return isActive; |
77 | 88 |
} |
Also available in: Unified diff
[Trunk | Monitor Service]:
1. trunk/src/test/java/eu/dnetlib/uoamonitorservice: New folders for tests.
2. ExceptionsHandler.java: Replace "log.debug" with "log.error".
3. Stakeholder.java: Field 'description' and getter/ setter methods added.
4. Topic.java: Field 'icon' and getter/ setter methods added | In method "copyFromDefault()", set "isActive" and "isPublic" fields of new Topic same as the values from default Topic.
5. TopicController.java: In method "onUpdateDefaultTopic()", add update for icon.
6. Category.java & SubCategory.java & Indicator.java:
In method "copyFromDefault()", set "isActive" and "isPublic" fields of new Category/ SubCategory/ Indicator same as the values from default Category/ SubCategory/ Indicator.
7. IndicatorController.java:
a. [Bug fix] Add some null checks when updating number indicators.
b. In method "parameterMapping()" comment replacement of "index_id", "index_name", "index_shortName" in indicatorPath.url (number indicators only).