|
[
Permlink
| « Hide
]
Peter A. Knoop added a comment - 16-Nov-2007 09:45
[Bulk Comment] This issue is still unresolved, but has a Fix Version set. The Fix Version(s) are being removed. Please use the Target Version field to indicate for which version(s) of Sakai you plan to address the issue.
Attaching patch file with changes to the user-prefs-tool (inside the "user " project) modifying the "Customize Tabs" preferences for the DHTML Tab Navigation enhancement.
When this enhancement is enabled, "Customize Tabs" works one way. When it is disabled, "Customize Tabs" reverts to its current implementation. Found a code smell in the previous patch file. Removed same, and added this new one.
Fixed another bug. Deleted the patch file and replaced it with the one that fixes this bug.
A patch file is attached that fixes this issue. Can someone with commit access review and commit it, please?
Thanks. As far as I can see there are no svn commits for this yet, so it shouldn't be marked resolved.
Megan, the short answer is: "no".
My understanding was that we were to make a patch for the 2.5.x branch, and then later address this issue in trunk. The "customize tabs" code in trunk is substantially different from that in the branch; it's unlikely that this patch would work with the trunk code. Also, I don't have commit access. Colin Clark advised me to attach the patch file, and send an email to sakai-dev asking that someone with commit access to please review and commit this patch. I've posted such a request -- look for the email with subject "Patch for What is the correct procedure for getting this patch into 2.5.0-rc1? This is a potential patch for trunk, BUT,
I am not certain that I know exactly what I am doing here so someone needs to check the patch over before I am prepared to commit. Things to check. Once applied: does the css still make sense. Is the Faces config file correct. Please could someone check the trunk patch, and give me the go-ahead to apply it. It is not the same as the 2.5 patch.
Thanks Ian, I'm not sure what this patch is? Is it intended to be applied *to* the trunk, or to merge trunk changes into the 2.5 branch, or other? (I'm not clear on the process of getting patches into the 2.5.0-rc1 release, so if anyone could clarify this, I would appreciate it!)
Your patch does not seem to include the new files: tab-dhtml-moresites.jsp and useDHTMLMore.css. These files are required by the other changes that are included in your patch. (I've been working on this with Joseph, who is not in the office today, so he's passed the baton to me.) Ian, I tried the patch you provided, but it was missing the jsp and css files.
I've recreated the patch to be applied to trunk. It's been tested, and should work: Ian, as Anastasia said in the last comment, she has attached the final patch for this JIRA. She has also emailed you regarding same, asking you to commit it to trunk on our behalf (since we do not have commit privileges). We are concerned that we might miss the deadline for the 2.5.0 rc1 branch (Mon Dec 17), so I am assigning you to this JIRA. Sorry if this is too unorthodox; not really sure what we should do.
Patch applied to trunk,
please check on Nightly and then assign to the 25 branch manager. I would also suggest you ask directly for this to be included in 2.5rc1 Ian, thank you very much for your help in committing our changes to trunk.
I have checked out trunk, looked for our code changes, and it's all there. We've built, deployed, and tested various configurations with nothing untoward. Assigning the issue to the 2.5.x Branch Manager. Note that, as Ian says, this is to be included in 2.5rc1 -- the "Target Versions". The merge into 2-5-x (r39399) has broken the 2-5-x build:
http://nightly2.sakaiproject.org/logs/sakai-rel/build-2007-12-19-01:00:01.log.txt [ERROR] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Compilation failure /home/tomcat3/sakai/user/user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/UserPrefsTool.java:[363,21] cannot find symbol symbol : variable prefTabCount location: class org.sakaiproject.user.tool.UserPrefsTool /home/tomcat3/sakai/user/user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/UserPrefsTool.java:[364,31] cannot find symbol symbol : variable prefTabCount location: class org.sakaiproject.user.tool.UserPrefsTool /home/tomcat3/sakai/user/user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/UserPrefsTool.java:[368,16] cannot find symbol symbol : variable prefTabCount location: class org.sakaiproject.user.tool.UserPrefsTool /home/tomcat3/sakai/user/user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/UserPrefsTool.java:[370,21] cannot find symbol symbol : variable prefTabCount location: class org.sakaiproject.user.tool.UserPrefsTool /home/tomcat3/sakai/user/user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/UserPrefsTool.java:[371,24] cannot find symbol symbol : variable prefTabCount location: class org.sakaiproject.user.tool.UserPrefsTool /home/tomcat3/sakai/user/user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/UserPrefsTool.java:[371,39] cannot find symbol symbol : variable DEFAULT_TAB_COUNT location: class org.sakaiproject.user.tool.UserPrefsTool /home/tomcat3/sakai/user/user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/UserPrefsTool.java:[373,23] cannot find symbol symbol : variable prefTabCount location: class org.sakaiproject.user.tool.UserPrefsTool /home/tomcat3/sakai/user/user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/UserPrefsTool.java:[383,24] cannot find symbol symbol : variable prefTabCount location: class org.sakaiproject.user.tool.UserPrefsTool /home/tomcat3/sakai/user/user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/UserPrefsTool.java:[383,39] cannot find symbol symbol : variable DEFAULT_TAB_COUNT location: class org.sakaiproject.user.tool.UserPrefsTool /home/tomcat3/sakai/user/user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/UserPrefsTool.java:[385,24] cannot find symbol symbol : variable prefTabCount location: class org.sakaiproject.user.tool.UserPrefsTool /home/tomcat3/sakai/user/user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/UserPrefsTool.java:[387,38] cannot find symbol symbol : variable prefTabCount location: class org.sakaiproject.user.tool.UserPrefsTool /home/tomcat3/sakai/user/user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/UserPrefsTool.java:[387,71] cannot find symbol symbol : variable DEFAULT_TAB_COUNT location: class org.sakaiproject.user.tool.UserPrefsTool /home/tomcat3/sakai/user/user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/UserPrefsTool.java:[388,24] cannot find symbol symbol : variable prefTabCount location: class org.sakaiproject.user.tool.UserPrefsTool /home/tomcat3/sakai/user/user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/UserPrefsTool.java:[686,16] cannot find symbol symbol : variable DEFAULT_TAB_COUNT location: class org.sakaiproject.user.tool.UserPrefsTool /home/tomcat3/sakai/user/user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/UserPrefsTool.java:[686,97] cannot find symbol symbol : variable DEFAULT_TAB_COUNT location: class org.sakaiproject.user.tool.UserPrefsTool Could someone clarify exactly which rev of which branch/trunk of the code we should be investigating?
Stephen's comment above references r39399 explicitly, but the log file he specifies indicates the code was updated to r39477. I checked out branches/sakai_2-5-x, and it's currently at r39488 ("last changed rev: 38214"). The logs indicated that a couple of variables are missing, and I think the patch should be simple, but I need to know which version of the code to generate the patch for. Can I just work with the latest rev of that branch, and produce a patch for that? (i.e. can I ignore questions of which rev failed, which revs were merged to which, etc?)
I've attached a patch that works with r39488 of sakai/branches/sakai_2-5-x. The file is called
Stephen, I've attached a patch file (
Committed patch r39496 - it looks good in 2-5-x now with and without the dhtml more tabs switched on.
Just for clarification, does a version of the 2.5.x patch (r39496) need to be applied to trunk as well, or was this only a problem in 2.5.x?
AFAIK it was just a problem in 2-5-x (some missing variable definitions).
Re: Peter's question about applying this change to trunk: the changes were incorporated into trunk -- see my comments above on Dec 14/07 (http://jira.sakaiproject.org/jira/browse/SAK-11460#action_57166). The missing variable defintions issue did not occur on trunk.
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 |
|
Bug
Closed
Major
Correct Customize Tabs to match new site navigation functionality 
