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.

Sign up for GitHub

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

Jump to bottom

Clean up Atmire CUA filters #193

Merged
merged 7 commits into from
Mar 16, 2016
Merged

Clean up Atmire CUA filters #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5605fc5
Fix filter label in Atmire CUA
alanorth Mar 10, 2016
3eb1e17
atmire-cua.cfg: Fix confusing ordering of config items
alanorth Mar 10, 2016
ddfeb96
atmire-cua.cfg: Move config option for permissions group
alanorth Mar 10, 2016
5569d48
messages.xml: Remove erroneous label for Atmire CUA
alanorth Mar 10, 2016
06aee4a
messages.xml: Clean up some XMLUI strings for Atmire CUA
alanorth Mar 16, 2016
87399dd
messages.xml: Sub region→Subregion in Atmire CUA strings
alanorth Mar 16, 2016
02a7920
messages.xml: Add missing XMLUI strings for Atmire CUA
alanorth Mar 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions dspace/config/modules/atmire-cua.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,13 @@ statistics.items.startyear=1985
# The user must always be logged in prior to seeing the admin editor.
# By default, only the general administrators can view the admin editor
#statistics.permissions.group=11
statistics.permissions.group=1597

plugin.single.org.dspace.app.xmlui.objectmanager.ItemAdapterReportingPlugin = com.atmire.plugins.ReportingSuitePlugin

# The number of hits before a commit occurs if none is present or -1 then the solr server will use time intervals to commit
solr.statistics.interval=-1

statistics.permissions.group=1597

#Ignore deleted items in statistics. TODO not fully implemented
ignore.deleted.objects=false

Expand All @@ -85,8 +84,8 @@ ui.default.internal.filtering=true
#Must match (scope)|(metadata:.*\..*:(discovery|date\((year|month)\)))
content.analysis.dataset.option.1=metadata:dc.date.issued:date(month)
content.analysis.dataset.option.2=scope
content.analysis.dataset.option.4=metadata:iso:discovery
content.analysis.dataset.option.3=metadata:type:discovery
content.analysis.dataset.option.4=metadata:iso:discovery
content.analysis.dataset.option.5=metadata:author:discovery
content.analysis.dataset.option.6=metadata:subject:discovery
content.analysis.dataset.option.7=metadata:title:discovery
Expand Down
59 changes: 40 additions & 19 deletions dspace/modules/xmlui/src/main/webapp/i18n/aspects/Statistics/messages.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,29 +586,28 @@ DAMAGE.
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.dc.type">Type (dc.type)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.type">Type (dc.type.*)</message>

<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.type">Submit Date (dc.date.accessioned)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.status">Status (dc.identifier.status)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.isijournal">ISI Journal (dc.isijournal.*)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.jtitle">Journal Title (dc.title.jtitle)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.ilrisubject">ILRI Subject (dc.isubject.*)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.cpwfsubject">CPWF Subject (dc.cpsubject.*)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.ccafsubject">CCAFS Subject (dc.ccsubject.*)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.ciforsubject">CIFOR Subject (dc.cisubject.*)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.iwmisubject">IWMI Subject (dc.iwsubject.*)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.isijournal">ISI journal (dc.isijournal.*)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.jtitle">Journal title (dc.title.jtitle)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.ilrisubject">ILRI subject (dc.isubject.*)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.cpwfsubject">CPWF subject (dc.cpsubject.*)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.ccafsubject">CCAFS subject (dc.ccsubject.*)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.ciforsubject">CIFOR subject (dc.cisubject.*)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.iwmisubject">IWMI subject (dc.iwsubject.*)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.region">Region (dc.rplace.*)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.country">Country (dc.cplace.*)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.subregion">Sub region (dc.srplace.*)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.subregion">Subregion (dc.srplace.*)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.crpsubject">CGIAR Research Program (dc.crsubject.*)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.basin">River Basin (dc.river.*)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.cta">CTA Subject (cg.subject.cta)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.wlesubject">WLE Subject (cg.subject.wle)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.bioversity">Bioversity Subject (cg.subject.bioversity)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.ciat">CIAT Subject (cg.subject.ciat)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.humidtropics">Humidtropics Subject (cg.subject.humidtropics)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.cipsubject">CIP Subject (cg.subject.cip)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.drylandssubject">Dryland Systems Subject (cg.subject.cip)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.icardasubject">ICARDA Subject (cg.subject.icarda)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.dateAccessioned">Submit Date (dc.date.accessioned)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.basin">River basin (dc.river.*)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.cta">CTA subject (cg.subject.cta)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.wlesubject">WLE subject (cg.subject.wle)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.bioversity">Bioversity subject (cg.subject.bioversity)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.ciat">CIAT subject (cg.subject.ciat)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.humidtropics">Humidtropics subject (cg.subject.humidtropics)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.cipsubject">CIP subject (cg.subject.cip)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.drylandssubject">Dryland Systems subject (cg.subject.drylands)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.icardasubject">ICARDA subject (cg.subject.icarda)</message>
<message key="xmlui.reporting-suite.statistics.graph-editor.data-source.dataset.option.dateAccessioned">Submit date (dc.date.accessioned)</message>

<message key="xmlui.administrative.group.EditGroupForm.show-in-cua">Show group in the Workflow Analysis</message>
<message key="xmlui.administrative.group.EditGroupForm.hide-in-cua">Hide group in Workflow Analysis</message>
Expand Down Expand Up @@ -796,6 +795,28 @@ DAMAGE.
<message key="xmlui.reporting-suite.statistics.contentanalysis.author">Author</message>
<message key="xmlui.reporting-suite.statistics.contentanalysis.subject">Subject</message>
<message key="xmlui.reporting-suite.statistics.contentanalysis.type">Type</message>
<message key="xmlui.reporting-suite.statistics.contentanalysis.dateAccessioned">Date Submitted</message>
<message key="xmlui.reporting-suite.statistics.contentanalysis.status">Status</message>
<message key="xmlui.reporting-suite.statistics.contentanalysis.isijournal">ISI journal</message>
<message key="xmlui.reporting-suite.statistics.contentanalysis.jtitle">Journal title</message>
<message key="xmlui.reporting-suite.statistics.contentanalysis.ilrisubject">ILRI subject</message>
<message key="xmlui.reporting-suite.statistics.contentanalysis.cpwfsubject">CPWF subject</message>
<message key="xmlui.reporting-suite.statistics.contentanalysis.ccafsubject">CCAFS subject</message>
<message key="xmlui.reporting-suite.statistics.contentanalysis.ciforsubject">CIFOR subject</message>
<message key="xmlui.reporting-suite.statistics.contentanalysis.iwmisubject">IWMI subject</message>
<message key="xmlui.reporting-suite.statistics.contentanalysis.region">Region</message>
<message key="xmlui.reporting-suite.statistics.contentanalysis.country">Country</message>
<message key="xmlui.reporting-suite.statistics.contentanalysis.subregion">Subregion</message>
<message key="xmlui.reporting-suite.statistics.contentanalysis.crpsubject">CGIAR Research Program</message>
<message key="xmlui.reporting-suite.statistics.contentanalysis.basin">River basin</message>
<message key="xmlui.reporting-suite.statistics.contentanalysis.cta">CTA subject</message>
<message key="xmlui.reporting-suite.statistics.contentanalysis.wlesubject">WLE subject</message>
<message key="xmlui.reporting-suite.statistics.contentanalysis.bioversity">Bioversity subject</message>
<message key="xmlui.reporting-suite.statistics.contentanalysis.ciat">CIAT subject</message>
<message key="xmlui.reporting-suite.statistics.contentanalysis.humidtropics">Humitropics subject</message>
<message key="xmlui.reporting-suite.statistics.contentanalysis.cipsubject">CIP subject</message>
<message key="xmlui.reporting-suite.statistics.contentanalysis.drylandssubject">Dryland Systems subject</message>
<message key="xmlui.reporting-suite.statistics.contentanalysis.icardasubject">ICARDA subject</message>
<message key="org.dspace.app.xmlui.aspect.statistics.editorparts.FiltersTransformer.title">Limit the data to:</message>
<message key="org.dspace.app.xmlui.aspect.statistics.editorparts.FiltersTransformer.rule">Add a rule</message>
<message key="statistics.editorparts.FiltersTransformer.dso">DSpace Object</message>
Expand Down