[
https://jira.duraspace.org/browse/DS-1236?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=26158#comment-26158
]
Ivan Masár commented on DS-1236:
--------------------------------
> As far as the conflicts concern, I cannot see any problem. Using the compare
> option (https://github.com/EKT/DSpace/compare/DS-1236) there seem to be no
> conflicts with DSpace master. Can you point me out the conflicts, please?
That's a common gotcha. Sometimes, if there was a conflict in the intermediate
commits, even though it's not there now, until you resolve it by merging or
rebasing, it won't allow you to do the merge. In the case of a GitHub pull
request, rebasing is the only option (AFAIK).
You have two options:
a) easy: create a new pull request
b) a bit complicated:
1) create a new branch (so that you have a backup of the current one)
2) in the branch where the pull request was made from: rebase, resolving any
conflicts
3) in the branch where the pull request was made from: force-push
> Auto update advance search drop down lists from configuration file
> ------------------------------------------------------------------
>
> Key: DS-1236
> URL: https://jira.duraspace.org/browse/DS-1236
> Project: DSpace
> Issue Type: Improvement
> Components: JSPUI
> Affects Versions: 1.8.2
> Reporter: Kostas Stamatis
> Assignee: Andrea Bollini
> Labels: has-patch, has-pull-request
> Attachments: autosearchfields_patch.diff, README.txt
>
>
> This proposed extension (implemented by National Documentation Centre/EKT -
> http://www.ekt.gr) allows the automated creation of dropdown menus in advance
> search according to configuration options.
> This is not an option in DSpace 1.8.2 since the advanceSearch.jsp includes
> the options in the select drop down menus in a hardcoded manner.
> USEFULNESS
> ---------------------
> In case you change the search indices in the default dspace.cfg configuration
> file, the drop down menus in the advance search page are not automatically
> updated with these new indices. With this extension, you do not have to worry
> about the advance jsp page since it is automatically updated from the
> configuration file.
> CONFIGURATION FILES
> ---------------------------------------
> In the default configuration file of DSpace (dspace.cfg) just declare the
> search indices that you want to have in the drop down menus within advance
> search page as follows:
> # Declare search indices to appear in drop down menus
> search.index.display.1 = author
> search.index.display.2 = title
> search.index.display.3 = keyword
> search.index.display.4 = abstract
> search.index.display.5 = author
> search.index.display.6 = series
> search.index.display.7 = abstract
> search.index.display.8 = mime
> search.index.display.9 = sponsor
> search.index.display.10 = identifier
> search.index.display.11 = language
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Dspace-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dspace-devel
